diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2008-03-23 20:35:00 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2008-03-23 20:35:00 +0400 |
| commit | eb90f297aa229a26dccab58470a4fe919f50db00 (patch) | |
| tree | 0d66ace4c1b371af316b47acf3df0ecc4dbd0130 /mysql-test | |
| parent | 9bd3b8545a44188502a1a142e6f2171ac5b600e1 (diff) | |
| parent | 4018b13915c2fa972cf4da90ab1b2272b855a490 (diff) | |
| download | mariadb-git-eb90f297aa229a26dccab58470a4fe919f50db00.tar.gz | |
Merge mysql.com:/home/hf/work/33334/my50-33334
into mysql.com:/home/hf/work/33334/my51-33334
client/mysqltest.c:
Auto merged
mysql-test/r/flush.result:
SCCS merged
mysql-test/t/flush.test:
SCCS merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/flush.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/flush.test | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result index f1b6c471943..b978304f59d 100644 --- a/mysql-test/r/flush.result +++ b/mysql-test/r/flush.result @@ -72,6 +72,7 @@ flush tables with read lock; unlock tables; drop table t1, t2; set session low_priority_updates=default; +select benchmark(200, (select sin(1))) > 1000; End of 5.0 tests set @old_general_log= @@general_log; set @old_read_only= @@read_only; diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test index 794423ca211..c832cb79158 100644 --- a/mysql-test/t/flush.test +++ b/mysql-test/t/flush.test @@ -164,6 +164,15 @@ drop table t1, t2; set session low_priority_updates=default; +# +# Bug #33334 mysqltest_embedded crashes when disconnecting before reap +# + +connect (con1,localhost,root,,); +send select benchmark(200, (select sin(1))) > 1000; +disconnect con1; +connection default; + --echo End of 5.0 tests # |