From 3b8d2707297ad4aa280fb59e0196b1e664a7ec62 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Apr 2008 10:27:56 +0200 Subject: Dynamically set debug flag for session only - avoid restart - keep all in one file - fix --check-testcase BitKeeper/deleted/.del-error_simulation-master.opt: Delete: mysql-test/t/error_simulation-master.opt mysql-test/r/error_simulation.result: Update result file mysql-test/t/error_simulation.test: Dynamically set debug flag for session only --- mysql-test/r/error_simulation.result | 1 + mysql-test/t/error_simulation-master.opt | 1 - mysql-test/t/error_simulation.test | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 mysql-test/t/error_simulation-master.opt (limited to 'mysql-test') diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result index 77599ba303b..6153dad2534 100644 --- a/mysql-test/r/error_simulation.result +++ b/mysql-test/r/error_simulation.result @@ -13,6 +13,7 @@ INSERT INTO t1 VALUES ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'), ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK'); set tmp_table_size=1024; +set session debug="d,raise_error"; SELECT MAX(a) FROM t1 GROUP BY a,b; ERROR 23000: Can't write; duplicate key in table 'tmp_table' set tmp_table_size=default; diff --git a/mysql-test/t/error_simulation-master.opt b/mysql-test/t/error_simulation-master.opt deleted file mode 100644 index edb77cfa85e..00000000000 --- a/mysql-test/t/error_simulation-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-debug=d,raise_error diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test index 2f6ea5eac87..f730c95208e 100644 --- a/mysql-test/t/error_simulation.test +++ b/mysql-test/t/error_simulation.test @@ -21,10 +21,15 @@ INSERT INTO t1 VALUES set tmp_table_size=1024; +# Set debug flag so an error is returned when +# tmp table in query is converted from heap to myisam +set session debug="d,raise_error"; + --replace_regex /in table '[^']+'/in table 'tmp_table'/ --error ER_DUP_KEY SELECT MAX(a) FROM t1 GROUP BY a,b; set tmp_table_size=default; - DROP TABLE t1; + + -- cgit v1.2.1