mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug#25197 repeat function returns null when using table field directly as count
- Return empty string also if count is unsigned and value is 0 mysql-test/r/func_str.result: Update test result mysql-test/t/func_str.test: Add test case for using an unsigned value as count parameter for REPEAT sql/item_strfunc.cc: The repeat function should return the emptystring if count is unsigned and equal to zero or count is signed and less than or equal to zero
This commit is contained in:
@ -1940,4 +1940,18 @@ abcxx
|
|||||||
select lpad('abc', cast(5 as unsigned integer), 'x');
|
select lpad('abc', cast(5 as unsigned integer), 'x');
|
||||||
lpad('abc', cast(5 as unsigned integer), 'x')
|
lpad('abc', cast(5 as unsigned integer), 'x')
|
||||||
xxabc
|
xxabc
|
||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
CREATE TABLE `t1` (
|
||||||
|
`id` varchar(20) NOT NULL,
|
||||||
|
`tire` tinyint(3) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`)
|
||||||
|
);
|
||||||
|
INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
|
||||||
|
SELECT REPEAT( '#', tire ) AS A,
|
||||||
|
REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
|
||||||
|
A B tire
|
||||||
|
0
|
||||||
|
# # 1
|
||||||
|
## ## 2
|
||||||
|
DROP TABLE t1;
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -1008,4 +1008,26 @@ select repeat('a', cast(2 as unsigned int));
|
|||||||
select rpad('abc', cast(5 as unsigned integer), 'x');
|
select rpad('abc', cast(5 as unsigned integer), 'x');
|
||||||
select lpad('abc', cast(5 as unsigned integer), 'x');
|
select lpad('abc', cast(5 as unsigned integer), 'x');
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #25197 :repeat function returns null when using table field directly as count
|
||||||
|
#
|
||||||
|
|
||||||
|
--disable_warnings
|
||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
--enable_warnings
|
||||||
|
|
||||||
|
CREATE TABLE `t1` (
|
||||||
|
`id` varchar(20) NOT NULL,
|
||||||
|
`tire` tinyint(3) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`)
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
|
||||||
|
|
||||||
|
SELECT REPEAT( '#', tire ) AS A,
|
||||||
|
REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
|
||||||
|
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
@ -2251,8 +2251,10 @@ String *Item_func_repeat::val_str(String *str)
|
|||||||
if (args[0]->null_value || args[1]->null_value)
|
if (args[0]->null_value || args[1]->null_value)
|
||||||
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) && !args[1]->unsigned_flag) // For nicer SQL code
|
|
||||||
|
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. */
|
||||||
/* Bounds check on count: If this is triggered, we will error. */
|
/* Bounds check on count: If this is triggered, we will error. */
|
||||||
if ((ulonglong) count > INT_MAX32)
|
if ((ulonglong) count > INT_MAX32)
|
||||||
|
Reference in New Issue
Block a user