diff options
| author | gluh@gluh.mysql.r18.ru <> | 2004-09-12 10:41:06 +0400 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2004-09-12 10:41:06 +0400 |
| commit | 3b7378f9924162215975090b45317f458020c4ff (patch) | |
| tree | acdce807452a6d635dbf2432431d5458d6650a3b /sql | |
| parent | 5099b678c562c02c66a2c8fa72ac87e12e31cf64 (diff) | |
| parent | c1d25e32ec0aa3747adb0f7571171b95c2beb755 (diff) | |
| download | mariadb-git-3b7378f9924162215975090b45317f458020c4ff.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 6952effb48f..0bddeed14d6 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1455,10 +1455,11 @@ longlong Item_func_find_in_set::val_int() { const char *substr_end= str_end + symbol_len; bool is_last_item= (substr_end == real_end); - if (wc == (my_wc_t) separator || is_last_item) + bool is_separator= (wc == (my_wc_t) separator); + if (is_separator || is_last_item) { position++; - if (is_last_item) + if (is_last_item && !is_separator) str_end= substr_end; if (!my_strnncoll(cs, (const uchar *) str_begin, str_end - str_begin, |