Merge

5 files changed, 22 insertions, 40 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4c72768a8e0..73ca9002806 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -508,13 +508,15 @@ sub command_line_setup () {
   # These are defaults for things that are set on the command line
 
   $opt_suite=        "main";    # Special default suite
-  my $opt_master_myport= 9306;
-  my $opt_slave_myport=  9308;
-  $opt_ndbcluster_port=  9350;
+  my $opt_comment;
+
+  my $opt_master_myport=       9306;
+  my $opt_slave_myport=        9308;
+  $opt_ndbcluster_port=        9350;
   $opt_ndbcluster_port_slave=  9358;
-  my $im_port=           9310;
-  my $im_mysqld1_port=   9312;
-  my $im_mysqld2_port=   9314;
+  my $im_port=                 9310;
+  my $im_mysqld1_port=         9312;
+  my $im_mysqld2_port=         9314;
 
   #
   # To make it easier for different devs to work on the same host,
@@ -626,6 +628,7 @@ sub command_line_setup () {
              'big-test'                 => \$opt_big_test,
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
+             'comment=s'                => \$opt_comment,
              'local'                    => \$opt_local,
              'local-master'             => \$opt_local_master,
              'netware'                  => \$opt_netware,
@@ -652,9 +655,14 @@ sub command_line_setup () {
              'help|h'                   => \$opt_usage,
             ) or usage("Can't read options");
 
-  if ( $opt_usage )
+  usage("") if $opt_usage;
+
+  if ( $opt_comment )
   {
-    usage("");
+    print "\n";
+    print '#' x 78, "\n";
+    print "# $opt_comment\n";
+    print '#' x 78, "\n\n";
   }
 
   foreach my $arg ( @ARGV )
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index df3b8090ab0..212f0b9beb4 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -257,6 +257,7 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then
   MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
   SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
   NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6`
+  NDBCLUSTER_PORT_SLAVE=`expr $MASTER_MYPORT + 7`
 
   echo "Using MTR_BUILD_THREAD      = $MTR_BUILD_THREAD"
   echo "Using MASTER_MYPORT         = $MASTER_MYPORT"
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 029f7c8d876..79b22964f8a 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2650,33 +2650,3 @@ DELIMITER ;
 
 DROP TRIGGER tr1;
 DROP TABLE t1;
-create table t1 (a text , b text);
-create table t2 (a text , b text);
-insert t1 values ("Duck, Duck", "goose");
-insert t1 values ("Duck, Duck", "pidgeon");
-insert t2 values ("We the people", "in order to perform");
-insert t2 values ("a more perfect", "union");
-select * from t1;
-a	b
-Duck, Duck	goose
-Duck, Duck	pidgeon
-select * from t2;
-a	b
-We the people	in order to perform
-a more perfect	union
-test.t1: Records: 2  Deleted: 0  Skipped: 0  Warnings: 0
-test.t2: Records: 2  Deleted: 0  Skipped: 0  Warnings: 0
-select * from t1;
-a	b
-Duck, Duck	goose
-Duck, Duck	pidgeon
-Duck, Duck	goose
-Duck, Duck	pidgeon
-select * from t2;
-a	b
-We the people	in order to perform
-a more perfect	union
-We the people	in order to perform
-a more perfect	union
-drop table t1;
-drop table t2;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 097b3d4c96f..e92b8cbc46d 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -33,6 +33,7 @@ rpl_ndb_sp007           : Bug #17290
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
-rpl_ndb_blob            : Bug #17505
-rpl_ndb_blob2           : Bug #17505
+rpl_ndb_blob            : Bug#17505
+rpl_ndb_blob2           : Bug#17505
 rpl_ndb_log             : results are not deterministic
+mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 3f2fa8e8bf2..90a6782200d 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode;
 DROP TRIGGER tr1;
 DROP TABLE t1;
 
+--disable_parsing
 #
 # Added for use-thread option
 #
@@ -1072,3 +1073,4 @@ select * from t2;
 
 drop table t1;
 drop table t2;
+--enable_parsing