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

Remove a race condition in innodb_bug53756.test.

Browse Source 
Before killing the server, tell mysql-test-run that it is to be expected.

Discussed with Bjorn Munch on IM.
This commit is contained in:
Marko Mäkelä 2012-02-15 16:28:00 +02:00
parent c3ef620d39
commit 2a6a6abb70
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb/t/innodb_bug53756.test
View File

@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666);
# Request a crash on next execution of commit. # Request a crash on next execution of commit.
SET SESSION debug="+d,crash_commit_before"; SET SESSION debug="+d,crash_commit_before";
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Execute the statement that causes the crash. # Execute the statement that causes the crash.
--error 2013 --error 2013
COMMIT; COMMIT;
@ -154,9 +157,6 @@ COMMIT;
--echo # --echo #
--echo # Restart server. --echo # Restart server.
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Turn on reconnect # Turn on reconnect
--enable_reconnect --enable_reconnect
# #

6
mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
View File

@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666);
# Request a crash on next execution of commit. # Request a crash on next execution of commit.
SET SESSION debug="+d,crash_commit_before"; SET SESSION debug="+d,crash_commit_before";
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Execute the statement that causes the crash. # Execute the statement that causes the crash.
--error 2013 --error 2013
COMMIT; COMMIT;
@ -154,9 +157,6 @@ COMMIT;
--echo # --echo #
--echo # Restart server. --echo # Restart server.
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Turn on reconnect # Turn on reconnect
--enable_reconnect --enable_reconnect
# #