doc/src/sgml/fdwhandler.sgml

@@ -67,16 +67,13 @@
      foreign tables using the wrapper.
      The validator function must be registered as taking two arguments, a
      text array containing the options to be validated, and an OID
-     representing the type of object the options are associated with. The
+     representing the type of object the options are associated with (in
-     latter corresponds to the OID of the system catalog the object
+     the form of the OID of the system catalog the object would be stored
-     would be stored in, one of:
+     in, either
-     <itemizedlist spacing="compact">
+     <literal>ForeignDataWrapperRelationId</literal>,
-      <listitem><para><literal>AttributeRelationId</literal></para></listitem>
+     <literal>ForeignServerRelationId</literal>,
-      <listitem><para><literal>ForeignDataWrapperRelationId</literal></para></listitem>
+     <literal>UserMappingRelationId</literal>,
-      <listitem><para><literal>ForeignServerRelationId</literal></para></listitem>
+     or <literal>ForeignTableRelationId</literal>).
-      <listitem><para><literal>ForeignTableRelationId</literal></para></listitem>
-      <listitem><para><literal>UserMappingRelationId</literal></para></listitem>
-     </itemizedlist>
      If no validator function is supplied, options are not checked at object
      creation time or object alteration time.
     </para>

src/backend/utils/error/elog.c

@@ -115,8 +115,8 @@ char	   *Log_destination_string = NULL;
 bool		syslog_sequence_numbers = true;
 bool		syslog_split_messages = true;
 
-/* Processed form of backtrace_functions GUC */
+/* Processed form of backtrace_symbols GUC */
-static char *backtrace_function_list;
+static char *backtrace_symbol_list;
 
 #ifdef HAVE_SYSLOG
 
@@ -831,13 +831,13 @@ matches_backtrace_functions(const char *funcname)
 {
 	const char *p;
 
-	if (!backtrace_function_list || funcname == NULL || funcname[0] == '\0')
+	if (!backtrace_symbol_list || funcname == NULL || funcname[0] == '\0')
 		return false;
 
-	p = backtrace_function_list;
+	p = backtrace_symbol_list;
 	for (;;)
 	{
-		if (*p == '\0')			/* end of backtrace_function_list */
+		if (*p == '\0')			/* end of backtrace_symbol_list */
 			break;
 
 		if (strcmp(funcname, p) == 0)
@@ -2180,7 +2180,7 @@ check_backtrace_functions(char **newval, void **extra, GucSource source)
 void
 assign_backtrace_functions(const char *newval, void *extra)
 {
-	backtrace_function_list = (char *) extra;
+	backtrace_symbol_list = (char *) extra;
 }
 
 /*