bk commit into 5.1 tree (kaa:1.2663)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa.  When kaa 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, 2008-02-13 21:57:50+03:00, kaa@kaamos.(none) +2 -0
  Post-merge fixes.

  mysql-test/r/mix2_myisam.result@stripped, 2008-02-13 21:57:48+03:00, kaa@kaamos.(none) +1 -0
    Post-merge fixes.

  mysql-test/r/range.result@stripped, 2008-02-13 21:57:48+03:00, kaa@kaamos.(none) +13 -13
    Post-merge fixes.

diff -Nrup a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result
--- a/mysql-test/r/mix2_myisam.result	2007-03-01 16:41:26 +03:00
+++ b/mysql-test/r/mix2_myisam.result	2008-02-13 21:57:48 +03:00
@@ -1415,6 +1415,7 @@ set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
 Note	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'c' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
diff -Nrup a/mysql-test/r/range.result b/mysql-test/r/range.result
--- a/mysql-test/r/range.result	2008-02-13 12:11:58 +03:00
+++ b/mysql-test/r/range.result	2008-02-13 21:57:48 +03:00
@@ -1153,6 +1153,19 @@ 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 varchar(32), index (a)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;
+INSERT INTO t1 VALUES
+('B'), ('A'), ('A'), ('C'), ('B'), ('A'), ('A');
+SELECT a FROM t1 WHERE a='b' OR a='B';
+a
+B
+B
+EXPLAIN SELECT a FROM t1 WHERE a='b' OR a='B';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	a	a	35	NULL	3	Using where; Using index
+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));
@@ -1167,16 +1180,3 @@ explain select * from t2 where a=1000 an
 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;
-CREATE TABLE t1 (
-a varchar(32), index (a)
-) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;
-INSERT INTO t1 VALUES
-('B'), ('A'), ('A'), ('C'), ('B'), ('A'), ('A');
-SELECT a FROM t1 WHERE a='b' OR a='B';
-a
-B
-B
-EXPLAIN SELECT a FROM t1 WHERE a='b' OR a='B';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	a	a	35	NULL	3	Using where; Using index
-DROP TABLE t1;