From f7f96cd28dcbbe222df80c65abc98dbaac71fbaf Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Dec 2007 16:43:38 +0400 Subject: [PATCH] after merge fix --- mysql-test/r/range.result | 28 ++++++++++++++-------------- tests/mysql_client_test.c | 2 ++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index 005969c7f18..92db6d8429f 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -1135,20 +1135,6 @@ item started price A1 2005-11-01 08:00:00 1000.000 A1 2005-11-15 00:00:00 2000.000 DROP TABLE t1; -create table t1 (a int); -insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -create table t2 (a int, b int, filler char(100)); -insert into t2 select A.a + 10 * (B.a + 10 * C.a), 10, 'filler' from t1 A, -t1 B, t1 C where A.a < 5; -insert into t2 select 1000, b, 'filler' from t2; -alter table t2 add index (a,b); -select 'In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)' Z; -Z -In following EXPLAIN the access method should be ref, #rows~=500 (and not 2) -explain select * from t2 where a=1000 and b<11; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ref a a 5 const 502 Using where -drop table t1, t2; BUG#32198 "Comparison of DATE with DATETIME still not using indexes correctly" @@ -1167,3 +1153,17 @@ explain select * from t1 where dateval >= '2007-01-01 00:00:00' and dateval <= ' id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range dateval dateval 4 NULL 2 Using where drop table t1; +create table t1 (a int); +insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t2 (a int, b int, filler char(100)); +insert into t2 select A.a + 10 * (B.a + 10 * C.a), 10, 'filler' from t1 A, +t1 B, t1 C where A.a < 5; +insert into t2 select 1000, b, 'filler' from t2; +alter table t2 add index (a,b); +select 'In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)' Z; +Z +In following EXPLAIN the access method should be ref, #rows~=500 (and not 2) +explain select * from t2 where a=1000 and b<11; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 ref a a 5 const 502 Using where +drop table t1, t2; diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 6042ff4a2bf..9284b2182b1 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -16903,7 +16903,9 @@ static void test_bug20023() int sql_big_selects_4; int sql_big_selects_5; +#if NOT_USED char query_buffer[MAX_TEST_QUERY_LENGTH]; +#endif /* Create a new connection. */