From: Martin Hansson
Date: April 18 2011 8:48am
Subject: bzr commit into mysql-trunk branch (martin.hansson:3327) Bug#11758558
List-Archive: http://lists.mysql.com/commits/135593
X-Bug: 11758558
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1705281318=="

--===============1705281318==
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:bjorn.munch@stripped

 3327 Martin Hansson	2011-04-18 [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-18 08:47:41 +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-18 08:46:17 +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


--===============1705281318==
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\
#   a2e8di1vxhlrlauk
# target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-trunk/
# testament_sha1: 6cb6ccbb232eb07787f63e437d5f8af700d9debf
# timestamp: 2011-04-18 10:48:09 +0200
# source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   0b9jwvy94a5x53fd
# 
# Begin bundle
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
LnI8AD/Au5IpwoSGGwqZsA==


--===============1705281318==--