diff options
| author | serg@serg.mylan <> | 2005-10-08 16:59:08 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-10-08 16:59:08 +0200 |
| commit | da625424e05dcb648b6e3e60934677f42697209b (patch) | |
| tree | 1557ba719e8fdc00808be214efaafb40e3969b95 /mysql-test | |
| parent | e27a831506f206c27a9f4a9540b2ecc6130c38bc (diff) | |
| parent | ae293f9ac53fd1acdba2b79729561a0f8d3e41d0 (diff) | |
| download | mariadb-git-da625424e05dcb648b6e3e60934677f42697209b.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_flush_tables.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/rpl_flush_tables.test | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_flush_tables.result b/mysql-test/r/rpl_flush_tables.result index 70e4774a920..1bdb79fd0b1 100644 --- a/mysql-test/r/rpl_flush_tables.result +++ b/mysql-test/r/rpl_flush_tables.result @@ -38,3 +38,9 @@ master-bin.000001 461 Query 1 461 use `test`; rename table t1 to t5, t2 to t1 master-bin.000001 527 Query 1 527 use `test`; flush tables select * from t3; a +stop slave; +drop table t1; +flush tables with read lock; +start slave; +stop slave; +ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction diff --git a/mysql-test/t/rpl_flush_tables.test b/mysql-test/t/rpl_flush_tables.test index 04158aed9e0..378fa479f09 100644 --- a/mysql-test/t/rpl_flush_tables.test +++ b/mysql-test/t/rpl_flush_tables.test @@ -37,4 +37,14 @@ select * from t3; # Note that all this confusion may cause warnings 'table xx is open on rename' # in the .err files; these are not fatal and are not reported by mysql-test-run. +stop slave; +connection master; +drop table t1; +connection slave; +flush tables with read lock; +start slave; +sleep 1; +--error 1192 +stop slave; + # End of 4.1 tests |