diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | dac8bb7f8a095e39f24b414b9ceb0cf463863acc (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /mysql-test/t/innodb_notembedded.test | |
| parent | 52c86aa1fe02dc204b0a194b163662d2f5508b96 (diff) | |
| parent | 8aea2dcca750e2e271ead60216965f327e989673 (diff) | |
| download | mariadb-git-dac8bb7f8a095e39f24b414b9ceb0cf463863acc.tar.gz | |
Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minus
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'mysql-test/t/innodb_notembedded.test')
| -rw-r--r-- | mysql-test/t/innodb_notembedded.test | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/innodb_notembedded.test b/mysql-test/t/innodb_notembedded.test index 564b947c75e..c74dc931505 100644 --- a/mysql-test/t/innodb_notembedded.test +++ b/mysql-test/t/innodb_notembedded.test @@ -36,9 +36,15 @@ rollback; connection b; reap; rollback; + +# Cleanup +connection a; +disconnect a; +--source include/wait_until_disconnected.inc +connection b; +disconnect b; +--source include/wait_until_disconnected.inc connection default; drop table t1; drop function f1; -disconnect a; -disconnect b; SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; |