diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
| commit | 3378a48698a311403651fe9bb83d1dfe80a98d78 (patch) | |
| tree | da9c4b945967d94e3b16c2fd56a52699aba69b66 /sql/item_strfunc.cc | |
| parent | f249185b6eead7796f15f880a896a7782222db99 (diff) | |
| parent | 44d4940fcc001a6606c63e8900d9e2bf41ea4e67 (diff) | |
| download | mariadb-git-3378a48698a311403651fe9bb83d1dfe80a98d78.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
SCCS 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 03887629519..1991526345c 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2319,7 +2319,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. */ |