1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.1->5.5 merge

Browse Source
This commit is contained in:
Sergey Glukhov 2011-03-28 12:03:53 +04:00
commit b1b17093c8
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/func_time.result
View File

@ -1347,6 +1347,12 @@ Warning 1292 Truncated incorrect time value: ''
Warning 1292 Truncated incorrect time value: '' Warning 1292 Truncated incorrect time value: ''
Warning 1292 Truncated incorrect time value: '' Warning 1292 Truncated incorrect time value: ''
DROP TABLE t1; DROP TABLE t1;
#
# Bug#11766112 59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
#
SELECT STR_TO_DATE(SPACE(2),'1');
STR_TO_DATE(SPACE(2),'1')
0000-00-00
End of 5.1 tests End of 5.1 tests
# #
# Bug#57039: constant subtime expression returns incorrect result. # Bug#57039: constant subtime expression returns incorrect result.

6
mysql-test/t/func_time.test
View File

@ -862,6 +862,12 @@ INSERT INTO t1 VALUES (''),('');
SELECT COUNT(*) FROM t1 GROUP BY TIME_TO_SEC(a); SELECT COUNT(*) FROM t1 GROUP BY TIME_TO_SEC(a);
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # Bug#11766112 59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
--echo #
SELECT STR_TO_DATE(SPACE(2),'1');
--echo End of 5.1 tests --echo End of 5.1 tests
--echo # --echo #

4
sql/item_timefunc.cc
View File

@ -315,8 +315,8 @@ 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 */ /* Skip pre-space between each argument */
while (val != val_end && my_isspace(cs, *val)) if ((val+= cs->cset->scan(cs, val, val_end, MY_SEQ_SPACES)) >= val_end)
val++; break;
if (*ptr == '%' && ptr+1 != end) if (*ptr == '%' && ptr+1 != end)
{ {