summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-28 09:32:49 +0200
committermsvensson@pilot.blaudden <>2007-03-28 09:32:49 +0200
commit171e91f17d424bafd47568557ee522a3f5e5384f (patch)
treed94a2bebe02f7fd99e99d97d211839237ef76c7b /sql/item_strfunc.cc
parentba3c96f507c0381531a43f6e5ee0500842f75025 (diff)
downloadmariadb-git-171e91f17d424bafd47568557ee522a3f5e5384f.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
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
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. */