diff options
author | unknown <monty@mysql.com> | 2005-02-10 02:27:37 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-02-10 02:27:37 +0200 |
commit | 9f04f9d0352e404cf64e044d1c22873595f276d2 (patch) | |
tree | 5b603904b731e515c447d53d7843855bfbbe2f8c /mysql-test/r/heap_hash.result | |
parent | 70d3ac05d97f7721e564a718ba79afd5eb7eb2cb (diff) | |
parent | 0fe1b28b750c12dd500e507f1b688887c9aca227 (diff) | |
download | mariadb-git-9f04f9d0352e404cf64e044d1c22873595f276d2.tar.gz |
Merge with 4.1
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
netware/mysql_test_run.c:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
netware/BUILD/nwbootstrap:
merge: keep local
scripts/make_binary_distribution.sh:
merge: keep local
sql/ha_heap.cc:
Trivial merge
sql/ha_innodb.cc:
Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
Simple merge
sql/item_func.cc:
Simple merge
sql/item_row.cc:
Simple merge
sql/item_strfunc.cc:
Simple merge
sql/item_subselect.cc:
Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
Diffstat (limited to 'mysql-test/r/heap_hash.result')
-rw-r--r-- | mysql-test/r/heap_hash.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/heap_hash.result b/mysql-test/r/heap_hash.result index 287e17a264d..1e6eb866fd6 100644 --- a/mysql-test/r/heap_hash.result +++ b/mysql-test/r/heap_hash.result @@ -355,3 +355,13 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t3 ref a a 44 const,const 6 Using where 1 SIMPLE t1 ref heap_idx heap_idx 22 const 7 Using where drop table t1, t2, t3; +create temporary table t1 ( a int, index (a) ) engine=memory; +insert into t1 values (1),(2),(3),(4),(5); +select a from t1 where a in (1,3); +a +1 +3 +explain select a from t1 where a in (1,3); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range a a 5 NULL 2 Using where +drop table t1; |