mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029

Browse source 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  merging
This commit is contained in:
unknown 2006-11-22 09:19:51 +04:00
commit 8473844792
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/r/date_formats.result
View file

@ -569,4 +569,13 @@ DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896)
NULL NULL
Warnings: Warnings:
Warning 1292 Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s' Warning 1292 Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s'
select str_to_date('04 /30/2004', '%m /%d/%Y');
str_to_date('04 /30/2004', '%m /%d/%Y')
2004-04-30
select str_to_date('04/30 /2004', '%m /%d /%Y');
str_to_date('04/30 /2004', '%m /%d /%Y')
2004-04-30
select str_to_date('04/30/2004 ', '%m/%d/%Y ');
str_to_date('04/30/2004 ', '%m/%d/%Y ')
2004-04-30
"End of 4.1 tests" "End of 4.1 tests"

8
mysql-test/t/date_formats.test
View file

@ -326,4 +326,12 @@ SELECT TIME_FORMAT("25:00:00", '%l %p');
# #
SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);
#
# Bug #22029: str_to_date returning NULL
#
select str_to_date('04 /30/2004', '%m /%d/%Y');
select str_to_date('04/30 /2004', '%m /%d /%Y');
select str_to_date('04/30/2004 ', '%m/%d/%Y ');
--echo "End of 4.1 tests" --echo "End of 4.1 tests"

7
sql/item_timefunc.cc
View file

@ -171,15 +171,16 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
for (; ptr != end && val != val_end; ptr++) for (; ptr != end && val != val_end; ptr++)
{ {
/* Skip pre-space between each argument */
while (val != val_end && my_isspace(cs, *val))
val++;
if (*ptr == '%' && ptr+1 != end) if (*ptr == '%' && ptr+1 != end)
{ {
int val_len; int val_len;
char *tmp; char *tmp;
error= 0; error= 0;
/* Skip pre-space between each argument */
while (val != val_end && my_isspace(cs, *val))
val++;
val_len= (uint) (val_end - val); val_len= (uint) (val_end - val);
switch (*++ptr) { switch (*++ptr) {