diff options
author | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:32:49 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:32:49 +0200 |
commit | e9b606bf3e0ccc9d9ff27541371cc5faf72dd813 (patch) | |
tree | d94a2bebe02f7fd99e99d97d211839237ef76c7b /sql/item_strfunc.cc | |
parent | d79f0973ce03e3bc25a2e2fa130cf129936d4bcd (diff) | |
download | mariadb-git-e9b606bf3e0ccc9d9ff27541371cc5faf72dd813.tar.gz |
Bug#25197 repeat function returns null when using table field directly as count
- Add extra test case from bug#27073
- Change "if" to be optimized for count > 0
mysql-test/r/func_str.result:
Add test case from bug#27073
mysql-test/t/func_str.test:
Add test case from bug#27073
sql/item_strfunc.cc:
Change the if statemnet to be optimized for the normal case where count > 0
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 627751a1106..0ffda000e60 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2252,7 +2252,7 @@ String *Item_func_repeat::val_str(String *str) goto err; // string and/or delim are null 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; /* Assumes that the maximum length of a String is < INT_MAX32. */ |