Fixed index_merge_myisam test.

mysql · Jun 15, 2015 · 52c2b27 · 52c2b27
1 parent e877ee2
commit 52c2b27
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/mysql-test/include/index_merge_ror_cpk.inc b/mysql-test/include/index_merge_ror_cpk.inc
@@ -325,6 +325,7 @@ analyze table t1;
 analyze table t2;
 -- enable_result_log
 
+--disable_warnings
 EXPLAIN UPDATE t1 SET col_time_nokey = 25
 WHERE (col_varchar_key, col_varchar_nokey) IN (
   SELECT col_int_key, col_int_key
@@ -342,7 +343,7 @@ WHERE (col_varchar_key, col_varchar_nokey) IN (
     ('s','a', 'm'), (0, 'n', 7)
   )
 );
-
+--enable_warnings
 
 DROP TABLE t1, t2;
 SET sql_mode = default;
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result
@@ -1999,11 +1999,6 @@ WHERE (col_time_key, col_int_key, col_int_key) IN (
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	UPDATE	t1	NULL	index	NULL	PRIMARY	4	NULL	2	100.00	Using where
 2	DEPENDENT SUBQUERY	t2	NULL	index_merge	col_int_key,col_time_key	col_int_key,col_time_key	4,3	NULL	3	100.00	Using intersect(col_int_key,col_time_key); Using where; Using index
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'a'
-Warning	1292	Truncated incorrect INTEGER value: 'm'
-Warning	1292	Truncated incorrect INTEGER value: 'n'
-Warning	1292	Incorrect time value: 's' for column 'col_time_key' at row 1
 UPDATE t1 SET col_time_nokey = 25
 WHERE (col_varchar_key, col_varchar_nokey) IN (
 SELECT col_int_key, col_int_key
@@ -2012,11 +2007,6 @@ WHERE (col_time_key, col_int_key, col_int_key) IN (
 ('s','a', 'm'), (0, 'n', 7)
 )
 );
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'a'
-Warning	1292	Truncated incorrect INTEGER value: 'm'
-Warning	1292	Truncated incorrect INTEGER value: 'n'
-Warning	1292	Incorrect time value: 's' for column 'col_time_key' at row 1
 DROP TABLE t1, t2;
 SET sql_mode = default;
 #

diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
@@ -2056,11 +2056,6 @@ WHERE (col_time_key, col_int_key, col_int_key) IN (
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	UPDATE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 2	DEPENDENT SUBQUERY	t2	NULL	index_merge	col_int_key,col_time_key	col_int_key,col_time_key	4,3	NULL	3	100.00	Using intersect(col_int_key,col_time_key); Using where; Using index
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'a'
-Warning	1292	Truncated incorrect INTEGER value: 'm'
-Warning	1292	Truncated incorrect INTEGER value: 'n'
-Warning	1292	Incorrect time value: 's' for column 'col_time_key' at row 1
 UPDATE t1 SET col_time_nokey = 25
 WHERE (col_varchar_key, col_varchar_nokey) IN (
 SELECT col_int_key, col_int_key
@@ -2069,11 +2064,6 @@ WHERE (col_time_key, col_int_key, col_int_key) IN (
 ('s','a', 'm'), (0, 'n', 7)
 )
 );
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'a'
-Warning	1292	Truncated incorrect INTEGER value: 'm'
-Warning	1292	Truncated incorrect INTEGER value: 'n'
-Warning	1292	Incorrect time value: 's' for column 'col_time_key' at row 1
 DROP TABLE t1, t2;
 SET sql_mode = default;
 #