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

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

 3453 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 12:58:47 +0000
+++ b/mysql-test/r/type_timestamp.result	2011-04-18 08:46:17 +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


--===============0074211406==
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\
#   ng2iwvc4xw1sycx7
# target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/
# testament_sha1: c96dbf83eb94c3fda867c43b58bb238b9781b54a
# timestamp: 2011-04-18 10:46:53 +0200
# source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.1/
# base_revision_id: bjorn.munch@stripped\
#   ouvty8oike4x0wn8
# 
# Begin bundle
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
tWDCJLUcXFzbf+/f01Ytb1dc7aXM7lZ12Xv5zuuyt9n6+dm9i+bduPE6y98j2pVsXNN8K7yau2d1
Pdt39r3kwaH93jsueDips9/H3eHjhcr5bGfB9HRE82nv7Gj6WlfyWOg750O5qUv3SdyUL1Tuek8m
HK2lpmby1Pu+jZcyXPp9jxXxKDePmza7nhSO2ZI0Jm6GT7J4Dt7elj3qdbF5sfdb2d952L1Se7nJ
2P5H1NJVfRztJqdanq8EerEdqmNPV8LlQ0O89V52Hw2PJ1POoUT0PeSOxcw/GUjL7In0aG5hjPUv
kv3OR2DKeb0cm1WLFxfcimb1k2TiTmviNtKVJHY/GoadBji/X5ObFo3o4RPqdCOTTzU73m0es8h0
NZi+Pvk/BSfa8E4PrPLyKfE7fxPN821aH2vI+ZxcJocfguTeMEXsVw+1i4txviShaYLNjKZXtWHk
/A0somoxXNhcsuns7nY8zXznJ8MoHl/J+6U+iUtKW9n0jdNyWXulDSd6za1s3dNmkL2hK8n2p1l7
+xxNRr2NCytKy9cWkjcll59ksXqhPDaXYN6WhmumLGX6RedxZcYSscISpLrlkqhnLJ2xPq7e2TZ3
RvljfonM++eYjsbKUKkinzYy/KypTWdUSa4Wk+9MXovSp9pTo3+jg5zltaTEOBOk/vc3HvUUMVlJ
8Btbl6z4ZMawv+FzveWlosxW9zqcW2b0eDxLzwibNKmyy0+SpNK5Iam5sZMWUudTBfgk5vf5pkcl
yyYx8GVtNmuJsu6ZrXsWMJY5xjjXHeI0JZuorLz0RJE8UleeEuM2UoeArRgc38Wpn1WZWnWqdJ4N
jei45s06KVUwYKkj6n1UpTmji3uMJaJN+2FhX7hgfHRqnrNmZ2L2LVY4rNaRO+J7NS8xZCmp1r7g
xMWLVscmTV415JuLCm9Ymln8my9wJyO9hCZZTGMoa04t62TU1rh4S5iZ8ZybnedZR4O7X9VPT99R
SuJyfCxxmL0S7qcFOfQ0T2ObFf7nsPJsStj5LI+DS8zqnA3HceI7JwcJwnGx8TVmXL2A+48T5qR0
sVlBhc++e8TqehuUP4ZazA5xL2Ysu4KeNWOEvXNB4DsOyVExDF1o8Xjkbo8KOApMZwK/8XckU4UJ
DAugbfA=


--===============0074211406==--