Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/mysql_install_db.sh:
  Auto merged

mysql-test/Makefile.am

@@ -44,6 +44,7 @@ dist-hook:
 		$(distdir)/std_data/ndb_backup51 \
 		$(distdir)/std_data/ndb_backup51_data_be \
 		$(distdir)/std_data/ndb_backup51_data_le \
+		$(distdir)/std_data/parts \
 		$(distdir)/lib
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
@@ -71,6 +72,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
 
@@ -86,6 +88,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51 \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \
+		$(DESTDIR)$(testdir)/std_data/parts \
 		$(DESTDIR)$(testdir)/lib
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
@@ -118,6 +121,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
 	do \

scripts/mysql_install_db.sh

@@ -189,12 +189,12 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
 #
 # or default to compiled-in locations.
 #
-if test -n "$srcdir"
-then
-  print_defaults="$srcdir/extra/my_print_defaults"
-elif test -n "$basedir"
+if test -n "$basedir"
 then
   print_defaults=`find_in_basedir my_print_defaults bin extra`
+elif test -n "$srcdir" 
+then
+  print_defaults="$srcdir/extra/my_print_defaults"
 else
   print_defaults="@bindir@/my_print_defaults"
 fi
@@ -211,22 +211,19 @@ parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 # Configure paths to support files
-if test -n "$srcdir"
-then
-  basedir="$srcdir"
-  bindir="$srcdir/client"
-  extra_bindir="$srcdir/extra"
-  mysqld="$srcdir/sql/mysqld"
-  mysqld_opt="--language=$srcdir/sql/share/english"
-  pkgdatadir="$srcdir/scripts"
-  scriptdir="$srcdir/scripts"
-elif test -n "$basedir"
+if test -n "$basedir"
 then
   bindir="$basedir/bin"
   extra_bindir="$bindir"
-  mysqld=`find_in_basedir mysqld libexec sbin bin`
+  mysqld=`find_in_basedir mysqld libexec sbin bin sql`
   pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
   scriptdir="$basedir/scripts"
+elif test -n "$srcdir"
+then
+  basedir="$srcdir"
+  bindir="$srcdir/client"
+  extra_bindir="$srcdir/extra"
+  mysqld="$srcdir/sql/mysqld"
 else
   basedir="@prefix@"
   bindir="@bindir@"
@@ -236,6 +233,13 @@ else
   scriptdir="@scriptdir@"
 fi
 
+if test -n "$srcdir"
+then
+  mysqld_opt="--language=$srcdir/sql/share/english"
+  pkgdatadir="$srcdir/scripts"
+  scriptdir="$srcdir/scripts"
+fi
+
 # Set up paths to SQL scripts required for bootstrap
 fill_help_tables="$pkgdatadir/fill_help_tables.sql"
 create_system_tables="$pkgdatadir/mysql_system_tables.sql"