From: Martin Hansson
Date: January 19 2011 2:13pm
Subject: bzr commit into mysql-5.5 branch (martin.hansson:3268) Bug#59173
List-Archive: http://lists.mysql.com/commits/129201
X-Bug: 59173
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1542288685=="

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

#At file:///data0/martin/bzrroot/bug59173/5.5/ based on revid:bjorn.munch@stripped

 3268 Martin Hansson	2011-01-19 [merge]
      Merge of fix for Bug#59173.

    modified:
      mysql-test/r/type_datetime.result
      mysql-test/t/type_datetime.test
      sql/item_cmpfunc.cc
=== modified file 'mysql-test/r/type_datetime.result'
--- a/mysql-test/r/type_datetime.result	2010-10-07 16:16:30 +0000
+++ b/mysql-test/r/type_datetime.result	2011-01-19 14:12:43 +0000
@@ -637,6 +637,17 @@ CAST(CAST('2008-07-29T10:42:51.1234567' 
 20080729104251.1234560
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '2008-07-29T10:42:51.1234567'
+# 
+# Bug#59173: Failure to handle DATE(TIME) values where Year, Month or
+# Day is ZERO 
+# 
+CREATE TABLE t1 (dt1 DATETIME);
+INSERT INTO t1 (dt1) VALUES ('0000-00-01 00:00:01');
+DELETE   FROM t1 WHERE dt1 = '0000-00-01 00:00:01';
+# Should be empty
+SELECT * FROM t1;
+dt1
+DROP TABLE t1;
 End of 5.1 tests
 #
 # Start of 5.5 tests

=== modified file 'mysql-test/t/type_datetime.test'
--- a/mysql-test/t/type_datetime.test	2010-10-07 16:16:30 +0000
+++ b/mysql-test/t/type_datetime.test	2011-01-19 14:12:43 +0000
@@ -445,6 +445,17 @@ SELECT CAST(CAST('00000002006-000008-000
 # show we truncate microseconds from the right
 SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime) AS DECIMAL(30,7));
 
+--echo # 
+--echo # Bug#59173: Failure to handle DATE(TIME) values where Year, Month or
+--echo # Day is ZERO 
+--echo # 
+CREATE TABLE t1 (dt1 DATETIME);
+INSERT INTO t1 (dt1) VALUES ('0000-00-01 00:00:01');
+DELETE   FROM t1 WHERE dt1 = '0000-00-01 00:00:01';
+--echo # Should be empty
+SELECT * FROM t1;
+DROP TABLE t1;
+
 --echo End of 5.1 tests
 
 --echo #

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2011-01-14 09:05:14 +0000
+++ b/sql/item_cmpfunc.cc	2011-01-19 14:12:43 +0000
@@ -918,7 +918,7 @@ int Arg_comparator::set_cmp_func(Item_re
         cache_converted_constant can't be used here because it can't
         correctly convert a DATETIME value from string to int representation.
       */
-      Item_cache_int *cache= new Item_cache_int();
+      Item_cache_int *cache= new Item_cache_int(MYSQL_TYPE_DATETIME);
       /* Mark the cache as non-const to prevent re-caching. */
       cache->set_used_tables(1);
       if (!(*a)->is_datetime())


--===============1542288685==
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\
#   lf8t22de2uo8tlpy
# target_branch: file:///data0/martin/bzrroot/bug59173/5.5/
# testament_sha1: bb6b476115bdb7222a3506e27352abcaf0b47ce1
# timestamp: 2011-01-19 15:13:31 +0100
# source_branch: file:///data0/martin/bzrroot/bug59173/5.1/
# base_revision_id: bjorn.munch@stripped\
#   58pj3ofc4dern1cy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdjggdgABkPfgFAQWPf//3/n
/7C////wYAvnz2ttMAKFUNND60RUooAoBSgAsJKBTCeRGjE1M0KY0U21T0ZT1P1ID1PUaPQj1NqD
jJk0YhiaYCBgTTBGCYmmmgAwhxkyaMQxNMBAwJpgjBMTTTQAYQaaEnqp5J6mah6j0mhoANAGjQAA
AAMlQA0ADQNAGg0GQBoAABoCqIgJoABGQE0MSTxUBo9JownpMR4pUDzCq6y202BlZMxMyf15/EZ4
+R6jdhux7mFh9JOcOc5Izb/Y7G2czzqGlpWYf28RWwoYGDHN/lyRO8lW0w54b6004rrtud/e15sX
897l4zMULn1Ucoez/drNk/i0+iP5wttkoTKZlMJmZ/tU/pBZ2X3VWqO+4WPLLVbCM6V1kc2odnlD
ujMoUkwQGdRMRjhxvuOo518oEIF5xPcqCfG8+u5UGJ4nWVFC6jfGh70zXSGfaa13SvyjGE/qfnBF
AmGaQln7RvxDC5UmQtTliqOc0/FHz1XX3ao1Z8EWVyqL9m3S9n8FEriM+WDKJupljert0lz8evpd
wymB7zMHYdvFoxvtMbhgymO+8o2iMkKERN7ASSSC4GsMIcKCLeeihK3DJOcIIkmhdYmX0Nr0U1I8
AcGcJgOkSD0LV3ByRA7w4jTdzBrCJsSN4BYD49JzDypUAXl3SzVKmLJb81xHDdKcYgZ7rr7UC0jt
RTZWKUpHhSZmdBob5pfENMlaULJhMqSUnothmVojmSezvMRxLByYxZgfc7XZkVLbksCaExAmAoJd
PEWUsZTbDd9qXZZXzhjGKli1XZskLqIqKo2yZofQrgw6aWC9/emlfttTBTGnZqkovJLJVRUlT3Vg
vgJ3SX/u7zl3MV0QLU3RoUBcvaWzC+LoNyG/OrXXTM477N7e2tcrtkcV9mkOKEoW8KJ9XBvbrdE3
4xv2iVi1tYNcatFpfGK7A99TRh43eEc12IOpsWKt5LoXIo5cnjHNGzQtddu9cRuY6WDozp7OcwBR
fU1mkSRqLT/eMjLJUDEE1dwjS6A2AjmmVdMdOq/Fhp2YyN2ZThkq3LMsmEV6cFkQs2xpdrbghp/+
f4GLNhd06GLOhqbM7jmQrdKsMl2+mtxCxV47XKmJwx2ambW0X5WaqmeM+e7Ww1r7ElI7G5iqy8V7
axxcQ3urwVjysMmoYbdVOCqISZXUxyED/W92snSMHz4Gy4gqYJqaURaMneTJtW3qV0s2MWNNyKMh
qbFzNa8nKL27s0NB4sQoV1chzs1SZSQec9dj35CAWlKPUgWkBRgMVjFky2LYhYvvbfk+HtNM7bo8
Io1H+h3h2Oz0YqtFHx6/Q+Ze2vdqPkrx585nrp10cLlV65wrilVf2rqVULpLIbk5WxVPctWuTQ86
rsFztZ7WnFqq5NPVSDHU8TnDBa20ZIvVuhd5uZ2RntwuSSqJcArdRWFMkcEUAo9N8ibkEqQUqGUJ
T057VjLd11KsNFL1zdmkZLEOTJTFuPPWyXW7TtOPDZpww36xJVSMp0r1OS/Q1qLGG5iqpwsopMug
iX0GiWSugapFsztLLCo4LGlaRGCRJ0loGMa0UoZqM91Kg4O0uOFGy4NWvG11t5L86qKs5pUuqzMu
RdjaxLtOkOsdnx9GdwDfGwZZKFUqVZVqjOo0qUlOxuTasuQqLVEJVTYL4hdelfc/D6JUlP1HE79y
UWIQSjIQoQXQDA2A1Qs+N0FACYP7SB7GQcyBDMdETJKJT/Is2R85tVUKT+sqExifj+Kf7FSgnFLx
55ET5n0P+Tz6kxMj4xSlWeo4gA8aHyZ9i43v0/I/MflzjCKo4xnSi5+u3I/NMfoc1DY/VfnXsyhc
1ouTCjVExV14rjNq61isr7fgO4jyeSKRBL4fCiIwf6v3LEP2xKKPte++JfH2eB2n3HgZKUeP4pAZ
TkfAifAZOfnDk8KicoSOCy/PVf4pNFgTD9QeAwEn15lBUgjX5bxoJPP0ajQJMNpV/APZxXf3eysy
DTcbdfmYm0JBQbigoOhx5M/nvwX25WvP8jGzksTndNyPLpb1sUi8+aIcno4tC4UnWlqaaS4/WV5K
wmnGFfpxM9WgVxYYH7hEpTXr2Rs3jlhWEwmiYgaUZxC9rXTCVrhDtjwLH8UmbKkcvKt6N7h2rrsl
1HFOh2s6iMoCBEwNRIRskTEMmspEm6C4FbAlEWzMSEbmXXbI0NrPzzCjBrjgeptrLfc+x/LTi7Y9
fePalG9Yiv9bC2557b4gexEo9OLHm7XwdqzzjZ5oYqrHnjtqvlrUpl6eODB4Mf2I2osj4JhxU8iO
CL0kioNbsOSs1Gsq80dE0q6eu97yDHHNZbicz9Zbe0ycLPyY4Wsnxb+C8w98XLxo0avzVPWdCHyc
3ZXk0yiq9FEPIPNRrz+eLNH2+TK6LcjCY7lyyT2ZR5LEJURQiSOxREVerr1Inqn1q7Z8KKOxqLn0
+bc789q9g78nqhoDvz4xgyeTz9KTsZCm328ewdH6I+iNaOZOR0O4msRixpiFUovWokuJjnHo769Z
KKEU+s8Wejc92UfJifDj5ksZiKhtinsRFtJ96Rvn+v8JjzCsP+GPgbWw8jrENCy6kdDi3bZ4PLJ9
0RSjBQUnuu7EGY6ReGs0UTJEdVxMQ1/XG3XbVlpYx9/fzdCJpBRze4KFCMbgVzrft4GoMxK7l25x
bbw4HvAO6PZGc6nlL60cVjebGw6dqrviFvM8WHz9zg3Q1ihHB0VGtSL0bIgSRihHh3rlLDw3oVsR
nMlKxF0Wvr3Lvl2au3xbfjEQXH1i6qRr/o+BMd8RKhMU+LrEbSNyL7VTj3tzJnfgxUYDtRkuXMvw
RnP1jqUzJXzNHRUiMUVTFug7j6/M+1t6MGaiIjHQibDJGxKJtrEKRWq13FpWYYLtBd39WZhleiIp
OKqExWKRFJQmIpHqx8fWEw5tSH2y0vpzj7lnaRDzakJBJg3sLnu70xdUyymdjM2KQDEhqXoKbrug
Ln4vZW+zSc47NR2LEFh5m82rfRREoUx20H3IxnOtdwWo7Cp6R27bnfeozqqrzohwjkbNJmQbz2yO
wOAOhoR0WWZ3LtIPDFokhg1PUI2daxB2tKfVHJ4KjGPInR4conNxJ1xHNKLyvqv8MdS4vneTDBER
UVisVpNI2T2MvF1vz9zY7GhmbDd5Vcc0x6zMm5GqwiiP2NMRylM2aERE7j8EfglKUpZ874xHlVoR
Ec6ItiUV7NcQ2uui5HzW3sdWPzw8vJavvqVOKyLOGkklKT5Iej2YRczYIq9yJhWyrnbKX8WlGth2
rcPkjYUI1EUWRfVzWq5OJHAoiIvw4exvQwZIw0xDBF6kUxlDUr8g8nc6kpM2HF4NB27NiUWn7Ts5
/Pqxa2xHxlRFEfP1Qs6LtEZ68slC3CN0R8TnejaTGg2GsNDFl1I65KW2XhnLO41HQ1dTF0e5XaW/
ScyI9+46Bkl9M63G7QnmQIQBqkng18yFqSZNFIeRJwykLFgP4u5IpwoSGxwQOwA=


--===============1542288685==--