summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@hfmain.(none)>2008-03-23 21:53:36 +0400
committerunknown <holyfoot/hf@hfmain.(none)>2008-03-23 21:53:36 +0400
commit5e23e6c09a9212c502e42a0cc824026ebd6f4687 (patch)
tree7a33c2f530cf00975ddc82b00f93645944b508b7 /mysql-test
parentd4efe0684b12fb0fd2b1f615ffd4cf26723eba06 (diff)
parentac3976343495c432845161e988d263458a93be0e (diff)
downloadmariadb-git-5e23e6c09a9212c502e42a0cc824026ebd6f4687.tar.gz
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/33334/my50-33334 client/mysqltest.c: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/flush.result1
-rw-r--r--mysql-test/t/flush.test9
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result
index ce64e09c1d3..778f138f29d 100644
--- a/mysql-test/r/flush.result
+++ b/mysql-test/r/flush.result
@@ -72,3 +72,4 @@ flush tables with read lock;
unlock tables;
drop table t1, t2;
set session low_priority_updates=default;
+select benchmark(200, (select sin(1))) > 1000;
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 72efa8a2ee6..4c6d4265600 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -164,4 +164,13 @@ 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;
+
# End of 5.0 tests