diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-15 16:28:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-15 16:28:00 +0200 |
| commit | 2a6a6abb70202e94eb0b6eec62f7bdde25d8a68b (patch) | |
| tree | 1285a4b8ec3575af2c7be936fc4cc91a5b05aca8 | |
| parent | c3ef620d393353d0882d0383b392bf70ce95a65b (diff) | |
| download | mariadb-git-2a6a6abb70202e94eb0b6eec62f7bdde25d8a68b.tar.gz | |
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.
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug53756.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_bug53756.test | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug53756.test b/mysql-test/suite/innodb/t/innodb_bug53756.test index 7a48f130b2c..04856d448cb 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53756.test +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test @@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666); # Request a crash on next execution of commit. 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. --error 2013 COMMIT; @@ -154,9 +157,6 @@ COMMIT; --echo # --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 --enable_reconnect # diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test index 37a79ea3021..ba035fe0a46 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test @@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666); # Request a crash on next execution of commit. 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. --error 2013 COMMIT; @@ -154,9 +157,6 @@ COMMIT; --echo # --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 --enable_reconnect # |