summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-10-04 14:15:59 +0300
committerunknown <bell@sanja.is.com.ua>2002-10-04 14:15:59 +0300
commit05c5908a9e801d604a5651ccb9fde081378435f9 (patch)
treec7e9f63a5d35171d649cbd11f951d58a8f953720 /mysql-test/r/merge.result
parente607221a3cd778131cc9250108473819c9b8c8a0 (diff)
parentf094b6af4c5c32bfda7f74461d47675ab61722a0 (diff)
downloadmariadb-git-05c5908a9e801d604a5651ccb9fde081378435f9.tar.gz
merging
include/mysql_com.h: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/key_primary.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/odbc.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/r/varbinary.result: Auto merged mysql-test/t/union.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_derived.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_update.cc: Auto merged sql/table.h: Auto merged
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 102f5520f48..27ce8e1d915 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -34,11 +34,11 @@ insert into t2 select NULL,message from t1;
insert into t1 select NULL,message from t2;
create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(test.t1,test.t2);
explain select * from t3 where a < 10;
-table type possible_keys key key_len ref rows Extra
-t3 range a a 4 NULL 10 where used
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t3 range a a 4 NULL 10 where used
explain select * from t3 where a > 10 and a < 20;
-table type possible_keys key key_len ref rows Extra
-t3 range a a 4 NULL 10 where used
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t3 range a a 4 NULL 10 where used
select * from t3 where a = 10;
a b
10 Testing
@@ -84,8 +84,8 @@ a b
19 Testing
19 Testing
explain select a from t3 order by a desc limit 10;
-table type possible_keys key key_len ref rows Extra
-t3 index NULL a 4 NULL 1131 Using index
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t3 index NULL a 4 NULL 1131 Using index
select a from t3 order by a desc limit 10;
a
699