diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-03 10:07:23 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-03 10:07:23 -0700 |
| commit | 911749ad6f8752b175786fa17b849dcc64b9ec75 (patch) | |
| tree | 6fcea04ca39f6e4df7020661ed20828b6975ed17 /mysql-test | |
| parent | 915a8ae42c640b259f7f155e9e8497ec7947d876 (diff) | |
| parent | ef5241ae05b0f1bdf3668b4f0876bf0b4fe309a0 (diff) | |
| download | mariadb-git-911749ad6f8752b175786fa17b849dcc64b9ec75.tar.gz | |
Merge 10.0-base->maria-10.0-mwl243.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/show_explain.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/show_explain.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/show_explain.result b/mysql-test/r/show_explain.result index da132a102e2..be0b1c28b06 100644 --- a/mysql-test/r/show_explain.result +++ b/mysql-test/r/show_explain.result @@ -442,9 +442,9 @@ WHERE pk= (SELECT MAX(pk) FROM t2 WHERE pk = 3) ); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 20 Using where -2 SUBQUERY t2 const PRIMARY PRIMARY 4 const 1 Using where +2 SUBQUERY t2 const PRIMARY PRIMARY 4 const 1 3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away -set @show_explain_probe_select_id=2; +set @show_explain_probe_select_id=1; set debug_dbug='+d,show_explain_probe_do_select'; SELECT * FROM t2 WHERE a = (SELECT MAX(a) FROM t2 @@ -453,7 +453,7 @@ WHERE pk= (SELECT MAX(pk) FROM t2 WHERE pk = 3) show explain for $thr2; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 20 Using where -2 SUBQUERY t2 const PRIMARY PRIMARY 4 const 1 Using where +2 SUBQUERY t2 const PRIMARY PRIMARY 4 const 1 3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: Note 1003 SELECT * FROM t2 WHERE a = diff --git a/mysql-test/t/show_explain.test b/mysql-test/t/show_explain.test index 57d86ece4f4..9bb6a2a9005 100644 --- a/mysql-test/t/show_explain.test +++ b/mysql-test/t/show_explain.test @@ -466,7 +466,7 @@ explain SELECT * FROM t2 WHERE a = WHERE pk= (SELECT MAX(pk) FROM t2 WHERE pk = 3) ); -set @show_explain_probe_select_id=2; +set @show_explain_probe_select_id=1; set debug_dbug='+d,show_explain_probe_do_select'; send SELECT * FROM t2 WHERE a = (SELECT MAX(a) FROM t2 |