Merge 5.3->5.5.

1 files changed, 5 insertions, 1 deletions

diff --git a/mysql-test/r/maria_mrr.result b/mysql-test/r/maria_mrr.result
index d0bf94d7dab..af7789eebff 100644
--- a/mysql-test/r/maria_mrr.result
+++ b/mysql-test/r/maria_mrr.result
@@ -390,6 +390,8 @@ col_varchar_1024_latin1_key varchar(1024) DEFAULT NULL,
 PRIMARY KEY (pk),
 KEY col_varchar_1024_latin1_key (col_varchar_1024_latin1_key)
 ) ENGINE=Aria;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1000 bytes
 INSERT INTO t1 VALUES
 (1,'z'), (2,'abcdefjhjkl'), (3,'in'), (4,'abcdefjhjkl'), (6,'abcdefjhjkl'),
 (11,'zx'), (12,'abcdefjhjm'), (13,'jn'), (14,'abcdefjhjp'), (16,'abcdefjhjr');
@@ -403,7 +405,7 @@ WHERE
 table1.col_varchar_1024_latin1_key = table2.col_varchar_10_latin1 AND table1.pk<>0 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	table2	ALL	NULL	NULL	NULL	NULL	2	Using where
-1	SIMPLE	table1	ref	PRIMARY,col_varchar_1024_latin1_key	col_varchar_1024_latin1_key	1027	test.table2.col_varchar_10_latin1	2	Using index condition(BKA); Using where; Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
+1	SIMPLE	table1	ref	PRIMARY,col_varchar_1024_latin1_key	col_varchar_1024_latin1_key	1003	test.table2.col_varchar_10_latin1	2	Using where
 SELECT count(*)
 FROM t1 AS table1, t2 AS table2
 WHERE
@@ -425,6 +427,8 @@ f4 varchar(1024) COLLATE utf8_bin,
 f5 varchar(1024) COLLATE latin1_bin, 
 KEY (f5)
 ) ENGINE=Aria TRANSACTIONAL=0 ;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1000 bytes
 # Fill the table with some data
 SELECT alias2.* , alias1.f2 
 FROM