summaryrefslogtreecommitdiff
path: root/mysql-test/t/show_explain.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-10 22:33:23 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-10 22:33:23 -0800
commit1ef07d0845300ad200671f9809dcd9ee8b2ff837 (patch)
tree5c22187a94c73c7f8099a5d366ab3fd425f8e578 /mysql-test/t/show_explain.test
parent421bbdcf1004806ccbee7b45d55e90ddc15c76ae (diff)
parentf853333e09b222f6d6d76d9343b6202b4769ffab (diff)
downloadmariadb-git-1ef07d0845300ad200671f9809dcd9ee8b2ff837.tar.gz
Merge 10.0-base -> 10.0.
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table().
Diffstat (limited to 'mysql-test/t/show_explain.test')
-rw-r--r--mysql-test/t/show_explain.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/show_explain.test b/mysql-test/t/show_explain.test
index 6ae9484db71..36274a27edf 100644
--- a/mysql-test/t/show_explain.test
+++ b/mysql-test/t/show_explain.test
@@ -30,6 +30,7 @@ drop view if exists v1;
#
-- source include/not_embedded.inc
+set debug_sync='RESET';
create table t0 (a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
@@ -1113,3 +1114,8 @@ show explain for foo;
--echo # End
drop table t0;
+
+connection default;
+disconnect con1;
+set debug_sync='RESET';
+