diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-09 22:00:15 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-09 22:00:15 +0100 |
| commit | 17fe643832eb03a0cdc0046a0a7cb7963143fc9b (patch) | |
| tree | cd78b56e7f59f946ca6f42d96b186a1489fb8bd2 /mysql-test/t/backup.test | |
| parent | 1d46459130c7037ab257037672da095c28aa9dac (diff) | |
| parent | ff808530dc60c44c8e587129758575b763224c3b (diff) | |
| download | mariadb-git-17fe643832eb03a0cdc0046a0a7cb7963143fc9b.tar.gz | |
Merge 5.0 -> 5.1
Diffstat (limited to 'mysql-test/t/backup.test')
| -rw-r--r-- | mysql-test/t/backup.test | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 61e80ec682e..c761f48cbcb 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -1,7 +1,10 @@ # The server need to be started in $MYSQLTEST_VARDIR since it # uses ../../std_data/ --- source include/uses_vardir.inc +--source include/uses_vardir.inc + +# Save the initial number of concurrent sessions +--source include/count_sessions.inc # # This test is a bit tricky as we can't use backup table to overwrite an old @@ -57,6 +60,9 @@ unlock tables; connection con1; reap; drop table t5; +connection default; +disconnect con1; +disconnect con2; remove_file $MYSQLTEST_VARDIR/tmp/t1.MYD; remove_file $MYSQLTEST_VARDIR/tmp/t2.MYD; remove_file $MYSQLTEST_VARDIR/tmp/t3.MYD; @@ -68,6 +74,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/t3.frm; remove_file $MYSQLTEST_VARDIR/tmp/t4.frm; remove_file $MYSQLTEST_VARDIR/tmp/t5.frm; + # End of 4.1 tests # End of 5.0 tests @@ -87,4 +94,11 @@ DROP TABLE `t+1`; RESTORE TABLE `t+1` FROM '../../tmp'; SELECT * FROM `t+1`; DROP TABLE `t+1`; +# +remove_file $MYSQLTEST_VARDIR/tmp/t@002b1.frm; +remove_file $MYSQLTEST_VARDIR/tmp/t@002b1.MYD; + + +# Wait till all disconnects are completed +--source include/wait_until_count_sessions.inc |