summaryrefslogtreecommitdiff
path: root/mysql-test/r/join_optimizer.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
commit76f0b94bb0b2994d639353530c5b251d0f1a204b (patch)
tree9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/join_optimizer.result
parent4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff)
parent5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff)
downloadmariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz
merge with 5.3
sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
Diffstat (limited to 'mysql-test/r/join_optimizer.result')
-rw-r--r--mysql-test/r/join_optimizer.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/join_optimizer.result b/mysql-test/r/join_optimizer.result
index 42c4c220e8c..5411b046766 100644
--- a/mysql-test/r/join_optimizer.result
+++ b/mysql-test/r/join_optimizer.result
@@ -32,6 +32,6 @@ explain
SELECT STRAIGHT_JOIN g.id FROM t2 a, t3 g USE INDEX(groups_dt)
WHERE g.domain = 'queue' AND g.type = a.type;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE a ALL NULL NULL NULL NULL 2
-1 SIMPLE g ref groups_dt groups_dt 70 const,test.a.type 13 Using index condition
+1 SIMPLE a ALL NULL NULL NULL NULL 2 Using where
+1 SIMPLE g ref groups_dt groups_dt 70 const,test.a.type 13 Using where
drop table t0,t1,t2,t3;