Commit 5ff0851d authored by kent@mysql.com's avatar kent@mysql.com

make_binary_distribution.sh:

  Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc
parent 6dbb56fd
Branches unavailable
Tags unavailable
No related merge requests found
This diff is collapsed.
......@@ -144,7 +144,6 @@ our $glob_use_running_server= 0;
our $glob_use_running_ndbcluster= 0;
our $glob_use_running_ndbcluster_slave= 0;
our $glob_use_embedded_server= 0;
our $glob_mysqld_restart= 0;
our @glob_test_mode;
our $using_ndbcluster_master= 0;
......@@ -166,7 +165,6 @@ our $path_my_basedir;
our $opt_vardir; # A path but set directly on cmd line
our $opt_vardir_trace; # unix formatted opt_vardir for trace files
our $opt_tmpdir; # A path but set directly on cmd line
our $opt_restart_cleanup; # Source a file with SQL drop statements
our $opt_usage;
our $opt_suite;
......@@ -661,7 +659,6 @@ sub command_line_setup () {
'netware' => \$opt_netware,
'old-master' => \$opt_old_master,
'reorder' => \$opt_reorder,
'restart-cleanup' => \$opt_restart_cleanup,
'script-debug' => \$opt_script_debug,
'sleep=i' => \$opt_sleep,
'socket=s' => \$opt_socket,
......@@ -3254,12 +3251,6 @@ sub run_mysqltest ($) {
mtr_add_arg($args, "--sleep=%d", $opt_sleep);
}
if ( $opt_restart_cleanup and $glob_mysqld_restart )
{
mtr_add_arg($args, "--include=%s", "include/drop-on-restart.inc");
$glob_mysqld_restart= 0;
}
if ( $opt_debug )
{
mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
......
......@@ -241,9 +241,10 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
mysql-test/std_data/*.cnf \
$BASE/mysql-test/std_data
$CP mysql-test/t/*.test mysql-test/t/*.imtest \
mysql-test/t/*.disabled mysql-test/t/*.opt \
mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
$CP mysql-test/t/*.test $BASE/mysql-test/t
$CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t
$CP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t
$CP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
$CP mysql-test/r/*.result mysql-test/r/*.require \
$BASE/mysql-test/r
$CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment