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

--===============0022123669==
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:serge.kozlov@stripped

 3444 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 07:27:03 +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


--===============0022123669==
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\
#   taknk0yf2uraaao4
# target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/
# testament_sha1: 4622cde589c080d0091ede37872541886439ab66
# timestamp: 2011-04-14 09:27:19 +0200
# source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.1/
# base_revision_id: serge.kozlov@stripped\
#   nb6gvmrt4lc1nwu9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa+F0CoACLbfgAAwWPf//3/v
/+C////wYAx9r6e9nNsAAAACpAvsAAADQAABKoRppo0GgA0aAANMg0GgAAAQij1DT00gaNMjTQAx
DJo0A0AAAGqelG1HkgGQADQMIZAAAAAAkSJpKeaU9TajyIeUek0aPKaeU0NNGI2U2k2UHqBKlDQe
iAABoAAADIMgNAABUoQJoAJppoAiZMiJ+lD1PU9QZH6kzUbSPU27TqZuINx3Gk0kwmDGIyAYcHBj
ePiDwVwbN1sCMg0EsEitIpnWoElGMpHMQsjFvAUwnCcSiNmMVSshAHmaorv959/AYaSSbEi06OHL
mrlA4iLUyEmB6nRqm2sLPgz3ZXXXsK5MN69/KzRxeRr6ye4fQ+4+4bachIkaQvmA+cXOVvLjGNib
QjygHAb+szBrDIDBttttcVgJLtFePbQmUKHCYueql0xqpwRBNyCyQORhIjIsJSHxDhEEFAZVCqFj
rIMcKTgpMFxIQSKO73cExwAUGWBBBDGEEVspPUM1fkNFOxCNwy5vBfNBV5y0MYxjY2Jar8gkDA6p
XsxYCYuQNAWGLPimno5uRMhZ6jnukBOcZKbKy2bThvubFs1+j8D6VbVPzYa1l2BdbQrqsxblzBK1
pyfUfUlSqRU2McshwyW1t1VNizeuqpsPRGXRVFB8XxsYKRhGhwbMomik/eGSIDqoisOrDllnZxJd
LK64SDomMbbbY76qqaoWyCCCRsb25vcGthQ1JIpupFKJV3P8EkqjGh99EJ95jhtXTfDcSTMknwMT
9ZJKtcT85NcveajeXnF3nGerQ9XaPcOTN7aFHXl2OwNnZTdzrr7DNJOUkUT1JmW33K1qy0Up3SmC
RY20XBQkltY1jdcs+c5EkoVkSLLxTLoM18whiSSgdnhwaV0woVHnWTTIl01WalqtTJVRqiOReuXy
uW53VvXzNc0biSZwzZRoYebFReyUwacXzHswaR/CufkusSSiVIovmhcXOdy98G9gkkxVpImvR3nH
/Rgxkk3Z/fTBi39OymtTQKNCvbXstj0ow1u1mn1UiMhXjn5Ni2n+uGsb5u7LLS0u73S+ZOL28eGT
uJJm1KOBfqUx5tPAws6m/J1tvppyF+6fOdrjN9Hg6aF9kTm33YBHmLPaf7FIoRSUKSiFpJM50pMM
HW12UtpqMNpV0d0SnPtWaYl7jjdjeMmpXgKt9yrrraYcVPJsfq959jyHU9dc0011pTY7FxN2xiow
xb7vUkmjBOWDUxNzNjfhzzNPNfhOLPAtMNdsmto8sNTbs6Z7N2CtHFvibni7tM3y0qYxMill97dE
XUHDGROrfbqvxb3Ol+6+vJWu6mmbrS2q0vbqNCbWhosw3c97zd87bYOFK7Vs2x2+C/2U9ndOHGzT
EvnbdhEpY5ME9l0NjbXto0/tSlOxc1sGng0XXL0zPvaMKY3OXhgnwMmzTz1atWF+trX1o8HlaZYj
stmsxV00YeHjW5i72zxL+Pa5ycMH/zY2U2KG6U4s6NjKrEub/HjqHXVk0ZeS9dEW5bFHdwcOJumO
DU3V2KaS1lHpjgpljdfJmzGLBrNazRpdHwWfsesTdZu2NTm36VKS8d60ymF+ptU8m9lk36lVGWTi
4OnTa0stlWfY0rbtTTtdPcoxwphVxWiupvsvo3ruWG7c2d8rv5Z7HfdnRwY4Ek4vJRqLru1ttRp2
zNEmNFViSYxW5pvXXqKtTesri0QqmC5YUYNCVwTRDLFRX8+fxIUnnGCUibhqGDZvgZRM1nY2wbfp
MI3HzdaKQseb+ZoH0a2L3JSSPzT+J/aSSEVnQEBvWNjTBtPYKqr1wYSoJiDrmSXWHYOlsIBWCYXI
QGmpAaum9ABESSS/mpikwf8xnfrNZ9f91m4NG/fk/lBRh6sXBhHMteklEkwx1/quP7OR+CdILm3T
JJ/Zo5hnF0YOssXUyVusSTaknbkFqGzj3MnSN1f/TZq4tkWoT9S7C28NW1ndA4KSSUUUx7A2pJXh
cub/6sYwKUa4LkktruTbDacbRqSTtuNNylFpJOeOwpZdJJpp3Y6ViNQpgMZ5jjCEl2j41I1rZ3SE
VAmXRVFgIzco0/BDKTONGgaGBUGyCBjAc2kY5KkobEpQIQ5FbY5pv3K3MIcGv8aD8W3F+NnfooYB
2O00vpKFFZI7RcpRwSZ0eLZJH1l/WWl6jZwXPh1t1/Z0w8eUq/guy3tJ3aenqwaK+jBun8V/a0vB
TvPxdo9weTs5Uxes/jvs352eqjTHHFouvdP+M318MHRwYuPJdJlZSJP2fzgb29OpiwoonxGS3Yon
Ao4OLp0dTjocJNWA1vJcrpwRhLPHX0druzYYZtbvzw8HqnP7Tk0Shi3P6emR0fo9LvPq+SsYFqzC
UNtpWl6+JK3pU4uLo42r4XMHswNN1zB1Y1s7/r6XeCjvXtDto6nIueB7qKV2uKbIU6E5zto1+967
X6SXsn39+qzFuZdlnL7O//yJxidZfRTx2uC+J7PFhouX3Vab/6LHA7pwdHRRdrk6JQXKTi854L9d
c2cyeGl9+pPVSzFZ/373guiUDcPRk1WfuojumKNCZOTF9k7R9vd2fMUW9rmTueNzL5PjPQ6scHra
TS6SdX6H3GkpTW7ayeruUe55I97vec5xNDKiifc+KqkNLwnkfKfBgeJZuVnq6vdSUJtPtkjvWX/l
KIy+xk2rr5tLpLtjgap3DKebscGxTFg4P3Ioye+TgTmtEbKKKSR0flSGjIwwfz83awaNqPmckb2j
oo4TvejRwZlz5fRWJ/c6O/MlHL8jq/eyVhcPm9U6nibV7b9huTaL0XMFh8XKYvR9pwiSgrMFW1lM
rmq/wfQzcU1mCzaWVWnvdzueRq7p2PexgeH6P75R7JRWUV9z2jbNqVXOxDM81VImxqVibImhrzC9
oSnun73aXP2OBqNetoVUzVXLEJIZIGEDQLFYFanUNBQhUKKcgxBQ9J8ReYz4RK6MoSkl1lUpQZyq
fSYuvWTR3xpmkWOmc0ToewjFqooKSRR5sJdjVSUajlEmqFZL3qslJ3FHDn6Nz0TjrZnJMQ3kwPo5
t/VQoMFVE/ANjauVfJiwpfd8lnV6ZtFWCvwPWJ2uTejwcSxq0KNVVZ6KSZNQuSGlsa2TFlLOa9de
k83w+1MTgsqmEj5GNc6tUmy3KalzsmLGEsq9HCWTwdy/3Up7fo0PJ8LrUYbrU1vo8XLgxd7KjOrd
xaWXbJVj3WSnM8WtuRY6Mk5UU+MrMGCkkfM+aiijoji3uMJWJN+6FRS408c575qxOi5gzqb1WlIn
nPg0rjBiKNLtXcxcGJixatjiyavOnom4qKN6pM2W5rubycDqvhMcZhGMNScW5XFpalhWLzHi1uJ2
FDq8p3afco9vxpFFN5wfaqb5gryfgN6rnyfAzTmwXfE8WpKanxVR7p8jS9D4Gw9ikTY2TbQ2RMcC
y5sm88T2UR1YKqBxs4vM8X536S82zsiXqLWUdaVLKsjsPmOAXuxHe695skzbExbXY//F3JFOFCQr
4XQKgA==


--===============0022123669==--