From: Martin Hansson
Date: January 20 2011 8:20am
Subject: bzr push into mysql-5.5 branch (martin.hansson:3269)
List-Archive: http://lists.mysql.com/commits/129250
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0162261369=="

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

 3269 Martin Hansson	2011-01-20 [merge]
      Merge.

    modified:
      strings/bchange.c
      strings/bmove_upp.c
      strings/conf_to_src.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-extra.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/do_ctype.c
      strings/dtoa.c
      strings/dump_map.c
      strings/int2str.c
      strings/is_prefix.c
      strings/llstr.c
      strings/longlong2str.c
      strings/my_strchr.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      strings/str2int.c
      strings/str_alloc.c
      strings/strappend.c
      strings/strcend.c
      strings/strcont.c
      strings/strend.c
      strings/strfill.c
      strings/strmake.c
      strings/strmov.c
      strings/strnlen.c
      strings/strnmov.c
      strings/strxmov.c
      strings/strxnmov.c
      strings/uca-dump.c
      strings/uctypedump.c
      strings/utr11-dump.c
      strings/xml.c
=== 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())


--===============0162261369==
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\
#   daabnuovwm7bi1s6
# target_branch: file:///data0/martin/bzrroot/bug59173/5.5/
# testament_sha1: ab0d76bf5aa62e15df5144a64b2e9f9e75313672
# timestamp: 2011-01-20 09:21:13 +0100
# source_branch: file:///data0/martin/bzrroot/bug59173/5.1/
# base_revision_id: bar@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfm4M1MABy3fgFAQWPf//3/n
/7C////wYAzL76667ZqtoyVEghWF3dyzbA60BrRK2ZUux1CSlPU9Q1PKepjU8nqR4ppoeoMgAA0A
yAyBJQJhGQGpMiIyaPU0yaBiNDI00AZNBxkyaMQxNMBAwJpgjBMTTTQAYQ4yZNGIYmmAgYE0wRgm
JppoAMIIlCCTTBKf6pPJjEU2o9J4mptTQHpNDTQNA0EkSYmgmgNA0TRkmCT0SGmgGhp6Q0PSRhXL
8c12WUnRCyyxMse+X1GZPI0FagoI9imTkrGqfNtrRznAo7077+7SZtNQu00On9vSNGFmBRjmy/V6
FOBfg5v3U1weyilLTcV/nJeBYS/HWbejMnCZ7jm1HofebA4p4mrqH3JddAokhJCJJJ76h+4lvLhf
BRHGbnI31R2O+9t7cJboKLXV1QqjXVUoQcdmabA2vWLDbTGmmqxgvFRhWZw5w8xHEoFapeZ8CgKT
IbpmKL4HfdSqpNleQq84W/hHpGdZT8m/P1nYSNrC3fWz3nOC01Vm6vY5jU9lGdovDnhHDNZ5SE92
LkEddrHiPWNGEgV1tZamk9t21Y9166+Hl2h42m8+RnD1Ps9nGf0XLEhODh6OMzblL8NVVX0dkkkh
Lg6j1FihDXztBu8cqM8owgu70Ymc5t04pZHlBwbBED4wBe05L5gwfch1E+0PZOt/AOIXGQl0ANIV
XdlwVReqAbTHs26+y5lf0z4i2amGok6YEF0pzqkIQwPKNNlWlKNKb5JJoDLSyUwU0xK0oFokg7A7
cVFFpBxbgYPQ5hQDEKgNpRVIrD0hyvlzhULryGISgRFIolAIc3QBali1oo1/J5W2zauNCpqFTBAk
Po0MAScUAIAbMCSVF4we6ZPXszKLBf42hLeAwQ2jeldGg4kES6BUahCnY1QxUSZQMPXs3Dsz7XOY
ooicmzWF1qPEgmqLYvjAJpiDZCnmnOxbjiZXhdNubkdWlUyTlyJvgAcAmIUC7Uzwq64N4VZKU1xs
AwbAwNiZos7QIphJNMJBHxZFZ070u5bidokGeYZA5EqWsGXEJic3bTotwtV2YkZasSYLWWYFZxrB
o3j72NtQBY+7CDbAKwYAWhcqvd48x1pKNMWOQO05IXDoDYIXXIcdmOmMZks9Z82gZ4jerIccD8sl
NO7OSeJP3WZ1m8kK3uPtChZXLLiFC5CwNGN5ttQqpsQRcTDF9A1AB41He2ObZheKnrmTfoqyfy3w
1gFla0mbFNiMBgdcFaUIFvQmailDaAbDkdxBd9QWmAFenB8SBcF7vhmapCUGQqvruhUZKsS4Rpwd
t+JFW4zV4VLxV8hp3wGtkWDSUZDwzl19yis8xOooKtBuNKMgfCaqJx11JVDvnwBRXzqOdpJJlFTC
B4M9n2xwmRC49HvIFbmAmugNWxQyMqkEh5KJXqOvoz3yTGml/coGAfcHMAgt5vx7FLSJn2wPEy9g
8goYnqea1B5ECrhp47WbDPPXBaqyBQmUhYMQJ5EngOEmCpGsa6KgNyxM0yZvIHWBOhI5F8TChngb
zDB6sk4iyo7w4E2UyRqctHYNmqFg1EV9TgHFXaJvrZnBky0hbVlA2kGkojFoyqw3MS8xCwxblyHg
pnW8TAry01HE82xMC+LAVU8F0MTZ1DgLhruVW86yoHYHV1b60nSgDAcNhgE3EMW5mA3K5RpqZOIG
XBQcN5PpisuFU4mb2wtMaql4u1ZsWO1dKLhC6CVXVW4wm5o1oUaZYNcJBsLuATDY5olMAgpZ6QIh
lLaV3KAoEQzDycUMeoWE4EZrJkmuZawB3F07fkLFwDhbAVqmpVjSrn0W4W4dLU1tKQlzky5tgrVC
5oDGrLIYo34McLzu7SFITvQ403ZMGwwyeKMFoHc/gPQ7bzkZ2DAQ4Ph9wf2eo9yGgNkhCJFhP0C3
E9cuKlApPhCgRzB4+JPeFQaJxR48/MyP5P6P+Tz/SJFHsySrme8coAPGhmZyBYDVNGUM4GV6LSaK
ZRDBWD+uwhnGLQDxw0H6E7iZYOEjOKQyHMEygZYkgswygoMTu6gNoPS9I0RIdXmoLifaetsD8/1N
B+yx4Zj6TDEPRQ868+QO8n2n2ECIRJVR6vrSEWPuPQVPQMkUhm8LElNC7Vj6+my5+pJwutST+sPM
mAgfpqs294VTn/LpaAhY3UHIWPOavaFp2vh6enWXlDoPwWXTV9DuOgYBad5aWnaB1M3bGsnG2Jh9
A0qzHRPcTGwMoB/hUF2wDlXzinUwkvQBbzyN7hvFhDHmN5pg46H5WvsZ8Epkmmvt8htncXQ7nAw9
gVGt22y1PF5EOPNVIkoxRNQ6FBxdhfEhcZk2rwCo/EYLLXW3nCYtZq2cVOdxNzExfA4mZOKV4iZm
N5mMwLnmJqMuJako/QKthuBbZmF5oYObmZC5tKWpYGou4WIHKzStoewa4Mtkj9Qds1DJevxXs7ms
qFD/VQRkdtM0hEvYE4umJ2jvOJA4FXVaOqFQgUida7NNRRjOPGFzePSh2sOhb7i1CqDsmRtT+ALE
Uy9CzhlDh9617DIzfBHad+FnluqqItAnuy0qevQpaHtVmodmNKBxEVKRSzFoIMTdJPwtao7kmdVC
9GwEeRwOMN6zsKBNA4LqAdhzTf1orF8zrM97dnDGO9vLQOxzvyNhI0GgMV5iitV6HPmCbkcH76jJ
u9xzgZwkefkazpfEmVnSu080K8Av7o2KhcYHbwdqy1A+n06b0HE+ovYWcW4GtDiHIGgBRUegBBMK
ZETBIGW5djmQyYHHST/JsS5zUeZavgUDrj4AyoyUBBpT+gIIu3q61t8v6svAAgj+RTuDSaA7wyBX
lUnDuDINoteqpPiu+5fNJO6onQO3OXAQWhkpiDQGZ0zAg5EgZC0e9I6IwLcxRfP16rJXLYkrs/uE
CdFFeSUzZcdQ8La05unhuC2LwVHGAUKkUQThsse7rEqNYaDQHHgQOaFHcHQr8vUNhqAzgnSfI8xU
HWUcB2KJAcyLv3N7SwR35I0sK4LU8EpKJ78iXw34cOhp8UApB7pglBMBn/I6gy5pMODJwYd/FZIN
ILUKcVAWPNai0uXxKJytBwFaSJFvxFcH6CyB7EymzOuJAEFBqxu0BtDv6w+i7AcTgoqGbQMsGcdj
Bl1UaNatxtC4KxMW/QF+7nOAxz4KhSZiqkYJxDsC5g4iC8yzp5oZG8zoXy0K/Oe29fMKuIC+Z1gw
EI07HNavgx+LAM5sk17VEiNEH4KzuzOQYcVchdvkYPV94WwvpwgcGEJQkI9k4mBPZqdB8wVGvUTk
ARFwCAdlx1SNExy5QIEw4oWxbTLWZwXQ9bz1DxCEdSOunTogvsLrJts1AWjVq3OznqKcppJ5x43e
1QzB0hNG/jZwfGE1ochBwCvnMN+bU3hhMgg4qhVIgoKDs60NvLeh7hyrv5mk4LMWrSGvwgbbGD0G
kDIddlaD3mleSEjLaFQmQdw+ghCEGLrj4CPCCvSQb3FFMlDhnQtJyvkLzIzKYU86/DwIk5wCAYlQ
Va8wMDDDB5IXiepWpKysVTtBg1tV5LoQ9ppHWY8rdj1jsCgOoGjZwccyCdiuQK4mpIIyv4g4QpGI
pWQpIIjU9GBYKHkAd5yMgYYLK8TuLw4aNAwoh94b93nkUM60C8WHE4vP0QsQjxJ5lfCNo4RrWpLx
DdNBpBleGgM4BeULckllaXhCUawDFZgjQGALgThdoCEnMQNlB2NkKS4IwnAIRhjiXRdNaqJBGInF
eqgeqaFwENOKuSIlyrC0lItc/xdyRThQkPm4M1M=


--===============0162261369==--