database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format.

Browse Source 
The problem appears when we have a space followed by a non-format symbol.

Fix: properly skip spaces.


mysql-test/r/date_formats.result:
  Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format.
    - test result.
mysql-test/t/date_formats.test:
  Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format.
    - test case.
sql/item_timefunc.cc:
  Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format.
    - skipping pre-spaces between each argument moved.
This commit is contained in:
unknown
2006-10-05 15:29:00 +05:00
parent 78f47b1b10
commit 89a4a3e92c
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,4 +530,13 @@ DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896)
NULL
Warnings:
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"

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

@ -317,4 +317,12 @@ SELECT TIME_FORMAT("25:00:00", '%l %p');
#
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"

8
sql/item_timefunc.cc
View File

@ -171,15 +171,15 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
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)
{
int val_len;
char *tmp;
/* Skip pre-space between each argument */
while (val != val_end && my_isspace(cs, *val))
val++;
val_len= (uint) (val_end - val);
switch (*++ptr) {
/* Year */