#At lp:maria/5.2 based on revid:igor@askmonty.org-20091221022615-kx5ieiu0okmiupuc 2740 Igor Babaev 2009-12-21 [merge] Merge from 5.2-dsmrr modified: mysql-test/r/innodb_mrr.result mysql-test/r/type_date.result === modified file 'mysql-test/r/innodb_mrr.result' --- a/mysql-test/r/innodb_mrr.result 2009-12-15 07:16:46 +0000 +++ b/mysql-test/r/innodb_mrr.result 2009-12-19 19:54:54 +0000 @@ -318,7 +318,7 @@ filler char(10), key(d), primary key (a, insert into t2 select A.a, B.a, B.a, A.a, 'filler' from t1 A, t1 B; explain select * from t2 force index (d) where d < 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range d d 5 NULL 47 Using index condition; Using MRR +1 SIMPLE t2 range d d 5 NULL 53 Using index condition; Using MRR drop table t2; drop table t1; set @@read_rnd_buffer_size= @read_rnd_buffer_size_save; === modified file 'mysql-test/r/type_date.result' --- a/mysql-test/r/type_date.result 2009-01-13 14:04:28 +0000 +++ b/mysql-test/r/type_date.result 2009-12-19 19:54:54 +0000 @@ -207,6 +207,7 @@ id select_type table type possible_keys Warnings: Warning 1292 Incorrect date value: '0000-00-00' for column 'a' at row 1 Warning 1292 Incorrect date value: '0000-00-00' for column 'a' at row 1 +Warning 1265 Data truncated for column 'a' at row 1 SELECT * FROM t1 WHERE a = '0000-00-00'; a 0000-00-00 @@ -214,6 +215,7 @@ a Warnings: Warning 1292 Incorrect date value: '0000-00-00' for column 'a' at row 1 Warning 1292 Incorrect date value: '0000-00-00' for column 'a' at row 1 +Warning 1265 Data truncated for column 'a' at row 1 SELECT * FROM t2 WHERE a = '0000-00-00'; a 0000-00-00 @@ -245,6 +247,7 @@ id select_type table type possible_keys Warnings: Warning 1292 Incorrect date value: '1000-00-00' for column 'a' at row 1 Warning 1292 Incorrect date value: '1000-00-00' for column 'a' at row 1 +Warning 1265 Data truncated for column 'a' at row 1 SELECT * FROM t1 WHERE a = '1000-00-00'; a 1000-00-00 @@ -252,6 +255,7 @@ a Warnings: Warning 1292 Incorrect date value: '1000-00-00' for column 'a' at row 1 Warning 1292 Incorrect date value: '1000-00-00' for column 'a' at row 1 +Warning 1265 Data truncated for column 'a' at row 1 SELECT * FROM t2 WHERE a = '1000-00-00'; a 1000-00-00