1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force restart before maria_showlog_error to get rid of status from previous connections

Browse Source 
This fixes a race condition in the test system

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
This commit is contained in:
Michael Widenius 2009-10-13 15:47:17 +03:00
parent 8ea19fa73e
commit c13f68fa14
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/maria_empty_logs.inc
View File

@ -1,6 +1,10 @@
# Maria help script. # Maria help script.
# Cleans up all logs to give recovery a fresh start. # 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; # API: set mel_keep_control_file=1 if want to keep control file;
# uses vardir, port and socket. # uses vardir, port and socket.

3
mysql-test/include/wait_for_status_var.inc
View File

@ -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); 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')`) while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`)
{ {
if (!$_status_timeout_counter) 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 Note: the following output may have changed since the failure was detected
--echo **** Showing STATUS, PROCESSLIST **** --echo **** Showing STATUS, PROCESSLIST ****
eval SHOW $status_type STATUS LIKE '$status_var'; eval SHOW $status_type STATUS LIKE '$status_var';

2
mysql-test/mysql-test-run.pl
View File

@ -2826,7 +2826,7 @@ sub mysql_install_db {
mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--basedir=%s", $install_basedir);
mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--datadir=%s", $install_datadir);
mtr_add_arg($args, "--loose-skip-innodb"); 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-ndbcluster");
mtr_add_arg($args, "--loose-skip-maria"); mtr_add_arg($args, "--loose-skip-maria");
mtr_add_arg($args, "--disable-sync-frm"); mtr_add_arg($args, "--disable-sync-frm");

1
mysql-test/suite/maria/t/maria_showlog_error-master.opt Normal file
View File

@ -0,0 +1 @@
--force-restart