merge

mysql-test/lib/v1/mysql-test-run.pl

@@ -150,7 +150,7 @@ our $default_vardir;
 our $opt_usage;
 our $opt_list_options;
 our $opt_suites;
-our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb,maria"; # Default suites to run
+our $opt_suites_default= "main,binlog,rpl,maria"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 

mysql-test/mysql-test-run.pl

@@ -2726,9 +2726,9 @@ sub setup_vardir() {
            <../plugin/*/.libs/*.so>,
            <../plugin/*/*/.libs/*.so>,
            <../sql/.libs/*.so>,
-           <../storage/*/*.so>,
-           <../plugin/*/*.so>,
-           <../sql/*.so>)
+           <$bindir/storage/*/*.so>,
+           <$bindir/plugin/*/*.so>,
+           <$bindir/sql/*.so>)
       {
         my $pname=basename($_);
         symlink rel2abs($_), "$plugindir/$pname";

mysql-test/t/long_tmpdir-master.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
 test -d "$d" || mkdir "$d"
 rm -f "$d"/*

mysql-test/t/lowercase_mixed_tmpdir-master.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 # This test requires a non-lowercase tmpdir directory on a case-sensitive
 # filesystem.