bk commit into 5.1 tree (gluh:1.2641)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-13 16:43:38+04:00, gluh@stripped +2 -0
  after merge fix

  mysql-test/r/range.result@stripped, 2007-12-13 16:43:36+04:00, gluh@stripped +14 -14
    after merge fix

  tests/mysql_client_test.c@stripped, 2007-12-13 16:43:36+04:00, gluh@stripped +2 -0
    after merge fix

diff -Nrup a/mysql-test/r/range.result b/mysql-test/r/range.result
--- a/mysql-test/r/range.result	2007-12-13 16:10:54 +04:00
+++ b/mysql-test/r/range.result	2007-12-13 16:43:36 +04:00
@@ -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 >
 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 -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c
--- a/tests/mysql_client_test.c	2007-12-13 15:49:56 +04:00
+++ b/tests/mysql_client_test.c	2007-12-13 16:43:36 +04:00
@@ -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. */