diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:34:04 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:34:04 +0200 |
| commit | 2473c35960d540950215c2e12d3f533ce33c9cba (patch) | |
| tree | 6744c0f02cd85c7f8eb60dc91905a0354eb7b466 /sql/item_strfunc.cc | |
| parent | 563a50770e5a079c8415d587eb8a0ecbc21246c4 (diff) | |
| parent | e9b606bf3e0ccc9d9ff27541371cc5faf72dd813 (diff) | |
| download | mariadb-git-2473c35960d540950215c2e12d3f533ce33c9cba.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
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 6b1921e5bc8..a7075a5c3a0 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2242,7 +2242,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. */ |