- renamed scripts/fill_func_tables.sh to scripts/fill_help_tables and

   updated all relevant files to honor this change (as discussed with vva)
 - added some more comments to the fill_help_tables script
 - minor cleanups

scripts/Makefile.am

@@ -20,7 +20,7 @@ bin_SCRIPTS =		@server_scripts@ \
 			msql2mysql \
 			mysql_config \
 			mysql_fix_privilege_tables \
-                        mysql_fix_extensions \
+			mysql_fix_extensions \
 			mysql_setpermission \
 			mysql_secure_installation \
 			mysql_zap \
@@ -38,7 +38,7 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			msql2mysql.sh \
 			mysql_config.sh \
 			mysql_fix_privilege_tables.sh \
-                        mysql_fix_extensions.sh \
+			mysql_fix_extensions.sh \
 			mysql_install_db.sh \
 			mysql_setpermission.sh \
 			mysql_secure_installation.sh \
@@ -48,17 +48,17 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysql_convert_table_format.sh \
 			mysql_find_rows.sh \
 			mysqlhotcopy.sh \
-		        mysqldumpslow.sh \
+			mysqldumpslow.sh \
 			mysql_explain_log.sh \
 			mysqld_multi.sh \
 			mysql_tableinfo.sh \
 			mysqld_safe.sh \
-			fill_func_tables.sh
+			fill_help_tables.sh
 
 EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
 			mysqlbug \
-                        fill_func_tables.sql
+			fill_help_tables.sql
 
 pkgdata_DATA =		make_binary_distribution
 
@@ -69,7 +69,7 @@ CLEANFILES =		@server_scripts@ \
 			msql2mysql \
 			mysql_config \
 			mysql_fix_privilege_tables \
-                        mysql_fix_extensions \
+			mysql_fix_extensions \
 			mysql_setpermission \
 			mysql_secure_installation \
 			mysql_zap \
@@ -79,7 +79,8 @@ CLEANFILES =		@server_scripts@ \
 			mysqlhotcopy \
 			mysqldumpslow \
 			mysqld_multi \
-                        fill_func_tables.sql
+ 			fill_help_tables \
+ 			fill_help_tables.sql
 
 SUPERCLEANFILES =	mysqlbug
 
@@ -134,7 +135,7 @@ SUFFIXES = .sh
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 
-all: fill_func_tables.sql
+all: fill_help_tables.sql
 
-fill_func_tables.sql: fill_func_tables ../Docs/manual.texi
-	./fill_func_tables < ../Docs/manual.texi > fill_func_tables.sql
\ No newline at end of file
+fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
+	./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql

scripts/fill_func_tables.sh → scripts/fill_help_tables.sh

 #!@PERL@
-# fill_func_tables - parse ../Docs/manual.texi 
-
-# Original version by vva 
+#
+# Usage: fill_help_tables <manual.texi>
+# Example: ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
+#
+# This script generates the SQL statements required by mysql_install_db to
+# fill up the tables for the server-side online function help, which can be
+# invoked with "help <function>" from the MySQL client.
+#
+# Please note, that you first need to update Docs/manual.texi with the
+# manual file from the separate "mysqldoc" BitKeeper-Tree! The manual.texi
+# included in the source tree is just an empty stub file - the full manual
+# is now maintained in a separate tree.
+#
+# Original version by Victor Vagin <vva@mysql.com>
+#
 
 my $cat_name= "";
 my $func_name= "";

scripts/mysql_install_db.sh

@@ -325,7 +325,7 @@ $i_f
 $c_t
 $c_c
 END_OF_DATA
-    cat fill_func_tables.sql
+    cat fill_help_tables.sql
 ) | eval "$execdir/mysqld $defaults --bootstrap --skip-grant-tables \
          --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $args" 
 then