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

--===============0821818114==
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-trunk/ based on revid:anitha.gopi@stripped

 3311 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 17:24:53 +0000
+++ b/mysql-test/r/type_timestamp.result	2011-04-14 09:02:14 +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 07:27:03 +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


--===============0821818114==
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\
#   z5sdw8yukrxbonpc
# target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-trunk/
# testament_sha1: 5062b8dedebdd45260329b3cfcac95884ce1798f
# timestamp: 2011-04-14 11:02:49 +0200
# source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   f2h4i4w9zusvzoam
# 
# Begin bundle
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


--===============0821818114==--