Commit 8c5be6a2 authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden

Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents 2600dade 171e91f1
...@@ -1964,6 +1964,15 @@ A B tire ...@@ -1964,6 +1964,15 @@ A B tire
0 0
# # 1 # # 1
## ## 2 ## ## 2
SELECT REPEAT('0', CAST(0 AS UNSIGNED));
REPEAT('0', CAST(0 AS UNSIGNED))
SELECT REPEAT('0', -2);
REPEAT('0', -2)
SELECT REPEAT('0', 2);
REPEAT('0', 2)
00
DROP TABLE t1; DROP TABLE t1;
SELECT UNHEX('G'); SELECT UNHEX('G');
UNHEX('G') UNHEX('G')
......
...@@ -1038,6 +1038,10 @@ INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2); ...@@ -1038,6 +1038,10 @@ INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
SELECT REPEAT( '#', tire ) AS A, SELECT REPEAT( '#', tire ) AS A,
REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`; REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
SELECT REPEAT('0', CAST(0 AS UNSIGNED));
SELECT REPEAT('0', -2);
SELECT REPEAT('0', 2);
DROP TABLE t1; DROP TABLE t1;
# #
......
...@@ -2242,7 +2242,7 @@ String *Item_func_repeat::val_str(String *str) ...@@ -2242,7 +2242,7 @@ String *Item_func_repeat::val_str(String *str)
goto err; // string and/or delim are null goto err; // string and/or delim are null
null_value= 0; null_value= 0;
if (count == 0 || count < 0 && !args[1]->unsigned_flag) if (count <= 0 && (count == 0 || !args[1]->unsigned_flag))
return &my_empty_string; return &my_empty_string;
/* Assumes that the maximum length of a String is < INT_MAX32. */ /* Assumes that the maximum length of a String is < INT_MAX32. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment