Commit 7e015f5e authored by Marko Mäkelä's avatar Marko Mäkelä

Remove a race condition in innodb_bug53756.test.

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

Discussed with Bjorn Munch on IM.
parent 5ac7890e
...@@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666); ...@@ -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; ...@@ -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
# #
......
...@@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666); ...@@ -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; ...@@ -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
# #
......
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