List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:September 1 2009 12:53pm
Subject:bzr commit into mysql-5.1 branch (mattias.jonsson:3096) Bug#20577
Bug#46362
View as plain text  
#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/ based on revid:mattias.jonsson@stripped

 3096 Mattias Jonsson	2009-09-01
      post push fix for bug#20577 and bug#46362, disabling warnings

    modified:
      mysql-test/include/partition_date_range.inc
      mysql-test/r/partition_pruning.result
=== modified file 'mysql-test/include/partition_date_range.inc'
--- a/mysql-test/include/partition_date_range.inc	2009-08-26 10:59:49 +0000
+++ b/mysql-test/include/partition_date_range.inc	2009-09-01 12:53:27 +0000
@@ -21,6 +21,8 @@ SELECT * FROM t1 WHERE a >= '1001-00-00'
 SELECT * FROM t1 WHERE a > '1001-00-00';
 --sorted_result
 SELECT * FROM t1 WHERE a = '1001-00-00';
+--echo # Disabling warnings for the invalid date
+--disable_warnings
 --sorted_result
 SELECT * FROM t1 WHERE a < '1999-02-31';
 --sorted_result
@@ -31,6 +33,7 @@ SELECT * FROM t1 WHERE a >= '1999-02-31'
 SELECT * FROM t1 WHERE a > '1999-02-31';
 --sorted_result
 SELECT * FROM t1 WHERE a = '1999-02-31';
+--enable_warnings
 --sorted_result
 SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
 --sorted_result
@@ -51,11 +54,14 @@ EXPLAIN PARTITIONS SELECT * FROM t1 WHER
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1001-00-00';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1001-00-00';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
+--echo # Disabling warnings for the invalid date
+--disable_warnings
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a <= '1999-02-31';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1999-02-31';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1999-02-31';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1999-02-31';
+--enable_warnings
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1001-01-01';
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0001-01-02' AND '1002-00-00';

=== modified file 'mysql-test/r/partition_pruning.result'
--- a/mysql-test/r/partition_pruning.result	2009-08-28 10:55:59 +0000
+++ b/mysql-test/r/partition_pruning.result	2009-09-01 12:53:27 +0000
@@ -58,6 +58,7 @@ a
 SELECT * FROM t1 WHERE a = '1001-00-00';
 a
 1001-00-00
+# Disabling warnings for the invalid date
 SELECT * FROM t1 WHERE a < '1999-02-31';
 a
 0000-00-00
@@ -82,8 +83,6 @@ a
 2001-01-01
 SELECT * FROM t1 WHERE a = '1999-02-31';
 a
-Warning	1292	Incorrect date value: '1999-02-31' for column 'a' at row 1
-Warnings:
 SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
 a
 0000-00-00
@@ -139,6 +138,7 @@ id	select_type	table	partitions	type	pos
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL	ref	a	a	4	const	1	Using where; Using index
+# Disabling warnings for the invalid date
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL,p0001-01-01,p1001-01-01,p2001-01-01	range	a	a	4	NULL	5	Using where; Using index
@@ -218,6 +218,7 @@ a
 SELECT * FROM t1 WHERE a = '1001-00-00';
 a
 1001-00-00
+# Disabling warnings for the invalid date
 SELECT * FROM t1 WHERE a < '1999-02-31';
 a
 0000-00-00
@@ -297,6 +298,7 @@ id	select_type	table	partitions	type	pos
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL	ALL	NULL	NULL	NULL	NULL	7	Using where
+# Disabling warnings for the invalid date
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL,p0001-01-01,p1001-01-01,p2001-01-01	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -385,6 +387,7 @@ a
 SELECT * FROM t1 WHERE a = '1001-00-00';
 a
 1001-00-00
+# Disabling warnings for the invalid date
 SELECT * FROM t1 WHERE a < '1999-02-31';
 a
 0000-00-00
@@ -409,8 +412,6 @@ a
 2001-01-01
 SELECT * FROM t1 WHERE a = '1999-02-31';
 a
-Warning	1292	Incorrect date value: '1999-02-31' for column 'a' at row 1
-Warnings:
 SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
 a
 0000-00-00
@@ -466,6 +467,7 @@ id	select_type	table	partitions	type	pos
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL	ref	a	a	4	const	1	Using where; Using index
+# Disabling warnings for the invalid date
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0001-01-01,pNULL,p0000-01-02,p1001-01-01	range	a	a	4	NULL	5	Using where; Using index
@@ -545,6 +547,7 @@ a
 SELECT * FROM t1 WHERE a = '1001-00-00';
 a
 1001-00-00
+# Disabling warnings for the invalid date
 SELECT * FROM t1 WHERE a < '1999-02-31';
 a
 0000-00-00
@@ -624,6 +627,7 @@ id	select_type	table	partitions	type	pos
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pNULL	ALL	NULL	NULL	NULL	NULL	7	Using where
+# Disabling warnings for the invalid date
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0001-01-01,pNULL,p0000-01-02,p1001-01-01	ALL	NULL	NULL	NULL	NULL	7	Using where


Attachment: [text/bzr-bundle]
Thread
bzr commit into mysql-5.1 branch (mattias.jonsson:3096) Bug#20577Bug#46362Mattias Jonsson1 Sep