Merge bk-internal:/home/bk/mysql-5.1-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

client/mysqldump.c

@@ -709,6 +709,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case 'T':
     opt_disable_keys=0;
+
+    if (strlen(argument) >= FN_REFLEN)
+    {
+      /*
+        This check is made because the some the file functions below
+        have FN_REFLEN sized stack allocated buffers and will cause
+        a crash even if the input destination buffer is large enough
+        to hold the output.
+      */
+      die(EX_USAGE, "Input filename too long: %s", argument);
+    }
+
     break;
   case '#':
     DBUG_PUSH(argument ? argument : default_dbug_option);
@@ -2482,17 +2494,6 @@ static void dump_table(char *table, char *db)
   {
     char filename[FN_REFLEN], tmp_path[FN_REFLEN];
 
-    if (strlen(path) >= FN_REFLEN)
-    {
-      /*
-        This check is made because the some the file functions below
-        have FN_REFLEN sized stack allocated buffers and will cause
-        a crash even if the input destination buffer is large enough
-        to hold the output.
-      */
-      die(EX_USAGE, "Input filename or options too long: %s", path);
-    }
-
     /*
       Convert the path to native os format
       and resolve to the full filepath.

mysql-test/Makefile.am

@@ -18,41 +18,125 @@
 ## Process this file with automake to create Makefile.in
 
 SUBDIRS = ndb
+DIST_SUBDIRS=ndb
 
-PRESCRIPTS =		mysql-test-run.pl
+benchdir_root=		$(prefix)
-
+testdir =	        $(benchdir_root)/mysql-test
-GENSCRIPTS =		mysql-test-run-shell \
+EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh \
-			install_test_db \
-			mtr \
-			mysql-test-run
-
-EXTRA_SCRIPTS = 	mysql-test-run-shell.sh \
-			install_test_db.sh \
 			valgrind.supp $(PRESCRIPTS)
-
+EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
-EXTRA_DIST_DIRS =       t r include lib std_data suite extra
+GENSCRIPTS =		mysql-test-run-shell install_test_db mtr mysql-test-run
-
+PRESCRIPTS =		mysql-test-run.pl
-EXTRA_DIST = 		$(EXTRA_DIST_DIRS) $(EXTRA_SCRIPTS) README
-
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
-
+test_DATA =		std_data/client-key.pem std_data/client-cert.pem \
+			std_data/cacert.pem std_data/server-cert.pem \
+			std_data/server-key.pem
 CLEANFILES = 		$(GENSCRIPTS)
 
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..
+
+
+dist-hook:
+	mkdir -p \
+		$(distdir)/t \
+                $(distdir)/extra/binlog_tests \
+                $(distdir)/extra/rpl_tests \
+		$(distdir)/r \
+		$(distdir)/include \
+		$(distdir)/std_data \
+		$(distdir)/std_data/ndb_backup50 \
+		$(distdir)/std_data/ndb_backup51 \
+		$(distdir)/lib
+	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t
+	-$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests
+	$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests
+	-$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests
+	-$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests
+	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
+	$(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include
+	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
+	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50
+	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51
+	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
+	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
+
+install-data-local:
+	$(mkinstalldirs) \
+		$(DESTDIR)$(testdir)/t \
+		$(DESTDIR)$(testdir)/extra/binlog_tests \
+		$(DESTDIR)$(testdir)/extra/rpl_tests \
+		$(DESTDIR)$(testdir)/r \
+		$(DESTDIR)$(testdir)/include \
+		$(DESTDIR)$(testdir)/std_data \
+		$(DESTDIR)$(testdir)/std_data/ndb_backup50 \
+		$(DESTDIR)$(testdir)/std_data/ndb_backup51 \
+		$(DESTDIR)$(testdir)/lib
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
+	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(DESTDIR)$(testdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
+	-$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t
+	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r
+	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r
+	$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(DESTDIR)$(testdir)/extra/binlog_tests
+	$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(DESTDIR)$(testdir)/extra/rpl_tests
+	-$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests
+	-$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests
+	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include
+	$(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include
+	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50
+	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51
+	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
+	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
+	do \
+	  d=$(DESTDIR)$(testdir)/`dirname $$f`; \
+	  mkdir -p $$d ; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $$d ; \
+	done
+
+uninstall-local:
+	@RM@ -f -r $(DESTDIR)$(testdir)
 
 # mtr - a shortcut for executing mysql-test-run.pl
 mtr:
-	@RM@ -f mtr
+	$(RM) -f mtr
-	@LN_S@ mysql-test-run.pl mtr
+	$(LN_S) mysql-test-run.pl mtr
 
 # mysql-test-run - a shortcut for executing mysql-test-run.pl
 mysql-test-run:
-	@RM@ -f mysql-test-run
+	$(RM) -f mysql-test-run
-	@LN_S@ mysql-test-run.pl mysql-test-run
+	$(LN_S) mysql-test-run.pl mysql-test-run
 
 SUFFIXES = .sh
 
-testdir =	        $(prefix)/mysql-test
-
 .sh:
 	@RM@ -f $@ $@-t
 	@SED@ \

mysql-test/r/mysqldump.result

@@ -3205,7 +3205,7 @@ DROP TABLE t1;
 #
 CREATE TABLE t1(a int);
 INSERT INTO t1 VALUES (1), (2);
-mysqldump: Input filename or options too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 DROP TABLE t1;
 CREATE TABLE t2 (a int);
 CREATE TABLE t3 (a int);