#At lp:maria based on revid:knielsen@knielsen-hq.org-20091006183755-y08lid6fg8mnr8sk 2744 Michael Widenius 2009-10-13 Force restart before maria_showlog_error to get rid of status from previous connections This fixes a race condition in the test system added: mysql-test/suite/maria/t/maria_showlog_error-master.opt modified: mysql-test/include/maria_empty_logs.inc mysql-test/include/wait_for_status_var.inc mysql-test/mysql-test-run.pl per-file messages: mysql-test/include/maria_empty_logs.inc Added comment mysql-test/include/wait_for_status_var.inc Fixed type in variable name. Add ' around variables for better error message mysql-test/mysql-test-run.pl Remove -skip-falcon (not to be used), add skip-pbxt to bootstrap mysql-test/suite/maria/t/maria_showlog_error-master.opt Force restart before maria_showlog_error to get rid of status from previous connection === modified file 'mysql-test/include/maria_empty_logs.inc' --- a/mysql-test/include/maria_empty_logs.inc 2009-02-19 09:01:25 +0000 +++ b/mysql-test/include/maria_empty_logs.inc 2009-10-13 12:47:17 +0000 @@ -1,6 +1,10 @@ # Maria help script. # Cleans up all logs to give recovery a fresh start. - +# +# Note that this script relies on the number of threads connect at start of +# this script, so one should run this script with a freshly started server +# for it to work. +# # API: set mel_keep_control_file=1 if want to keep control file; # uses vardir, port and socket. === modified file 'mysql-test/include/wait_for_status_var.inc' --- a/mysql-test/include/wait_for_status_var.inc 2009-04-03 21:33:13 +0000 +++ b/mysql-test/include/wait_for_status_var.inc 2009-10-13 12:47:17 +0000 @@ -51,11 +51,12 @@ if (`SELECT '$_status_var_comparsion' = } let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1); + while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`) { if (!$_status_timeout_counter) { - --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparison $status_var_value **** + --echo **** ERROR: failed while waiting for '$status_type' '$status_var' $_status_var_comparsion '$status_var_value' **** --echo Note: the following output may have changed since the failure was detected --echo **** Showing STATUS, PROCESSLIST **** eval SHOW $status_type STATUS LIKE '$status_var'; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-06 18:37:55 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-13 12:47:17 +0000 @@ -2826,7 +2826,7 @@ sub mysql_install_db { mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--loose-skip-innodb"); - mtr_add_arg($args, "--loose-skip-falcon"); + mtr_add_arg($args, "--loose-skip-pbxt"); mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--loose-skip-maria"); mtr_add_arg($args, "--disable-sync-frm"); === added file 'mysql-test/suite/maria/t/maria_showlog_error-master.opt' --- a/mysql-test/suite/maria/t/maria_showlog_error-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/maria/t/maria_showlog_error-master.opt 2009-10-13 12:47:17 +0000 @@ -0,0 +1 @@ +--force-restart