From: Martin Hansson
Date: April 14 2011 9:32am
Subject: bzr commit into mysql-5.5 branch (martin.hansson:3446) Bug#11758558
List-Archive: http://lists.mysql.com/commits/135412
X-Bug: 11758558
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1260473163=="

--===============1260473163==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/martin/bzrroot/bug11758558/mysql-5.5/ based on revid:jon.hauglid@stripped

 3446 Martin Hansson	2011-04-14 [merge]
      Merge of test case for bug#11758558 - 50774

    modified:
      mysql-test/r/type_timestamp.result
      mysql-test/t/type_timestamp.test
=== modified file 'mysql-test/r/type_timestamp.result'
--- a/mysql-test/r/type_timestamp.result	2011-01-12 12:58:47 +0000
+++ b/mysql-test/r/type_timestamp.result	2011-04-14 09:31:45 +0000
@@ -523,6 +523,69 @@ a
 2000-01-01 00:00:01
 2000-01-01 00:00:01
 DROP TABLE t1;
+#
+# Bug#50774: failed to get the correct resultset when timestamp values 
+# are appended with .0
+#
+CREATE TABLE t1 ( a TIMESTAMP, KEY ( a ) );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' <= a;
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+SELECT * FROM t1 WHERE a <= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:01
+2010-02-01 09:31:02
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' >= a;
+a
+2010-02-01 09:31:01
+2010-02-01 09:31:02
+EXPLAIN
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	x	x	range	x	x	x	x	x	x
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+CREATE TABLE t2 ( a TIMESTAMP, KEY ( a DESC ) );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:04' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:05' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:06' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:07' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+# The bug would cause the range optimizer's comparison to use an open
+# interval here. This reveals itself only in the number of reads 
+# performed.
+FLUSH STATUS;
+EXPLAIN
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	x	x	range	x	x	x	x	x	x
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:01
+SHOW STATUS LIKE 'Handler_read_next';
+Variable_name	Value
+Handler_read_next	1
+DROP TABLE t1, t2;
 End of 5.1 tests
 
 Bug#50888 valgrind warnings in Field_timestamp::val_str

=== modified file 'mysql-test/t/type_timestamp.test'
--- a/mysql-test/t/type_timestamp.test	2011-01-12 12:58:47 +0000
+++ b/mysql-test/t/type_timestamp.test	2011-04-14 09:31:45 +0000
@@ -362,6 +362,53 @@ SELECT a FROM t1 WHERE a >= '20000101000
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#50774: failed to get the correct resultset when timestamp values 
+--echo # are appended with .0
+--echo #
+CREATE TABLE t1 ( a TIMESTAMP, KEY ( a ) );
+
+INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' <= a;
+SELECT * FROM t1 WHERE a <= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' >= a;
+
+--replace_column 1 x 2 x 3 x 5 x 6 x 7 x 8 x 9 x 10 x
+EXPLAIN
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+
+CREATE TABLE t2 ( a TIMESTAMP, KEY ( a DESC ) );
+
+INSERT INTO t2 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:04' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:05' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:06' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:07' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+
+--echo # The bug would cause the range optimizer's comparison to use an open
+--echo # interval here. This reveals itself only in the number of reads 
+--echo # performed.
+FLUSH STATUS;
+--replace_column 1 x 2 x 3 x 5 x 6 x 7 x 8 x 9 x 10 x
+EXPLAIN
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+SHOW STATUS LIKE 'Handler_read_next';
+
+DROP TABLE t1, t2;
+
 --echo End of 5.1 tests
 
 --echo


--===============1260473163==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.hansson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@stripped\
#   2z5wh5244aarwvbh
# target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/
# testament_sha1: a03ef56dc89712b978c17bec0d8788681218fe61
# timestamp: 2011-04-14 11:32:37 +0200
# source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.1/
# base_revision_id: jon.hauglid@stripped\
#   fqpuizu8yhrlf10q
# 
# Begin bundle
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
LzibpoMA5Mj+LuSKcKEgdAdj1g==


--===============1260473163==--