diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
| commit | c58d9d9a9dda3037db574bbf97b22e7c1c274e02 (patch) | |
| tree | 54ccfe80d1405cb4325209020ea3c34d86a60770 /mysql-test/r/merge.result | |
| parent | 33fc0d53b543032accea2476a4eed0522cead2bb (diff) | |
| download | mariadb-git-c58d9d9a9dda3037db574bbf97b22e7c1c274e02.tar.gz | |
Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
Updated results
mysql-test/r/heap_hash.result:
Updated results
mysql-test/r/merge.result:
Updated results
mysql-test/r/rpl_log.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/subselect.result:
Updated results
sql/item_cmpfunc.h:
Fix after merge
sql/log_event.cc:
Fix after merge
sql/mysql_priv.h:
Fix after merge
sql/sql_acl.cc:
Fix after merge
sql/sql_class.cc:
Fix after merge
sql/sql_db.cc:
Fix after merge
sql/sql_delete.cc:
Fix after merge
sql/sql_lex.cc:
Fix after merge
sql/sql_lex.h:
Fix after merge
sql/sql_parse.cc:
Fix after merge
sql/sql_update.cc:
Fix after merge
sql/sql_yacc.yy:
Fix after merge
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 45b5bd9ddb7..cd78ac791c4 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -35,10 +35,10 @@ 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; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t3 range a a 4 NULL 10 Using where +1 SIMPLE t3 range a a 4 NULL 18 Using where explain select * from t3 where a > 10 and a < 20; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t3 range a a 4 NULL 10 Using where +1 SIMPLE t3 range a a 4 NULL 16 Using where select * from t3 where a = 10; a b 10 Testing @@ -581,18 +581,18 @@ KEY files (fileset_id,fileset_root_id) ) TYPE=MRG_MyISAM UNION=(t1); EXPLAIN SELECT * FROM t2 IGNORE INDEX (files) WHERE fileset_id = 2 AND file_code BETWEEN '0000000115' AND '0000000120' LIMIT 1; -table type possible_keys key key_len ref rows Extra -t2 range PRIMARY PRIMARY 33 NULL 5 Using where +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 range PRIMARY PRIMARY 33 NULL 5 Using where EXPLAIN SELECT * FROM t2 WHERE fileset_id = 2 AND file_code BETWEEN '0000000115' AND '0000000120' LIMIT 1; -table type possible_keys key key_len ref rows Extra -t2 range PRIMARY,files PRIMARY 33 NULL 5 Using where +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 range PRIMARY,files PRIMARY 33 NULL 5 Using where EXPLAIN SELECT * FROM t1 WHERE fileset_id = 2 AND file_code BETWEEN '0000000115' AND '0000000120' LIMIT 1; -table type possible_keys key key_len ref rows Extra -t1 range PRIMARY,files PRIMARY 33 NULL 5 Using where +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range PRIMARY,files PRIMARY 33 NULL 5 Using where EXPLAIN SELECT * FROM t2 WHERE fileset_id = 2 AND file_code = '0000000115' LIMIT 1; -table type possible_keys key key_len ref rows Extra -t2 const PRIMARY,files PRIMARY 33 const,const 1 +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 const PRIMARY,files PRIMARY 33 const,const 1 DROP TABLE IF EXISTS t1, t2; |