summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-10-11 14:50:19 +0200
committerunknown <msvensson@shellback.(none)>2006-10-11 14:50:19 +0200
commita0081378801c21915e94ca25a16213843d42599f (patch)
tree113d09a1a5d1387179005773c8d65048c21cafc2 /mysql-test/t
parent3caef95e641b335b5fb0fcbaec79ec97d868c816 (diff)
downloadmariadb-git-a0081378801c21915e94ca25a16213843d42599f.tar.gz
Improve restart logic all code to detect restart is now in the functions
'run_testcase_need_master/slave_restart' Remove the faulty qw Only look for mysql_fix_privilege_tables if not windows mysql-test/lib/mtr_cases.pl: Move all code to determine when to restart into 'run_testcase_need_master/slave_restart' Add possibility to wite --force-restart in -master.opt file, this will force a restart and since master is not started with any special options there is no need to restart again afterwards. mysql-test/mysql-test-run.pl: Remove the qw surrounding ENV{'LD_LIBRARY_PATH'} Only look for the sh script mysql_fix_privileges when not on windows Remove warnings about using unitialized variables Improve the restart logic, eall code to determine when to restart is now in run_testcase_need_master_restart and run_testcase_need_slave_restart mysql-test/t/bdb-alter-table-2-master.opt: Use --force-restart mysql-test/t/not_embedded_server-master.opt: Use --force-restart
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/bdb-alter-table-2-master.opt2
-rw-r--r--mysql-test/t/not_embedded_server-master.opt2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/bdb-alter-table-2-master.opt b/mysql-test/t/bdb-alter-table-2-master.opt
index 15ad73c500f..c2dca33445b 100644
--- a/mysql-test/t/bdb-alter-table-2-master.opt
+++ b/mysql-test/t/bdb-alter-table-2-master.opt
@@ -1,2 +1,2 @@
---skip-external-locking
+--force-restart
diff --git a/mysql-test/t/not_embedded_server-master.opt b/mysql-test/t/not_embedded_server-master.opt
index 35fcc5f30c6..cef79bc8585 100644
--- a/mysql-test/t/not_embedded_server-master.opt
+++ b/mysql-test/t/not_embedded_server-master.opt
@@ -1 +1 @@
---loose-to-force-a-restart
+--force-restart