diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:35:03 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 09:35:03 +0200 |
| commit | 55883e9628d9419632bae1e0ab8c72d3e6ba97b9 (patch) | |
| tree | f2874939148ed07480219819763b67e1efbc8124 /sql/item_strfunc.cc | |
| parent | d8ddc1aa833728a1bc685f313f1585299f0ebd51 (diff) | |
| parent | cce2cb5733909279d6ff2b1687b1082a8035fd58 (diff) | |
| download | mariadb-git-55883e9628d9419632bae1e0ab8c72d3e6ba97b9.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-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 a011a2884c8..1629f75efae 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2271,7 +2271,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. */ |