Merge mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

Makefile.am

@@ -75,6 +75,10 @@ init-db:		all
 bin-dist:		all
 	$(top_builddir)/scripts/make_binary_distribution
 
+# Remove BK's "SCCS" subdirectories from source distribution
+dist-hook:
+	rm -rf `find $(distdir) -type d -name SCCS`
+
 tags:
 	support-files/build-tags
 .PHONY:		init-db bin-dist

bdb/Makefile.in

@@ -24,12 +24,13 @@ top_srcdir = @top_srcdir@
 
 bdb_build = build_unix
 files = LICENSE Makefile Makefile.in README
-subdirs = btree build_vxworks build_win32 clib common cxx db db185 \
-	db_archive db_checkpoint db_deadlock db_dump db_dump185 db_load \
-	db_printlog db_recover db_stat db_upgrade db_verify dbm dist \
-	env examples_c examples_cxx hash hsearch include java libdb_java \
-	lock log mp mutex os os_vxworks os_win32 perl.BerkeleyDB \
-	perl.DB_File qam rpc_client rpc_server tcl test txn xa
+subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \
+  dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \
+  db_dump185 db_load db_printlog db_recover db_stat db_upgrade \
+  db_verify dbm dbreg dist env examples_c examples_cxx fileops hash \
+	hsearch hmac include java libdb_java lock log mp mutex os os_vxworks \
+	os_win32 perl.BerkeleyDB perl.DB_File qam rep rpc_client rpc_server tcl \
+	test txn xa
 
 @SET_MAKE@
 

cmd-line-utils/libedit/Makefile.am

@@ -20,10 +20,12 @@ pkginclude_HEADERS =	readline/readline.h
 
 noinst_HEADERS =	chared.h el.h histedit.h key.h \
 			parse.h refresh.h sig.h sys.h \
-			tokenizer.h compat.h fgetln.h \
+			tokenizer.h compat.h compat_conf.h fgetln.h \
 			hist.h map.h prompt.h search.h \
 			strlcpy.h term.h tty.h
 
+EXTRA_DIST = makelist
+
 DEFS =			-DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR
 
 vi.h: vi.c makelist

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
+fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
+	./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
\ No newline at end of file

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