diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-21 12:19:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-21 12:19:47 +0400 |
| commit | f5b73fe3f14de97370fa184378de9c27575dceae (patch) | |
| tree | ea32d07b9791aededf988ba8f09bd142cdf4cfef /sql/item_strfunc.cc | |
| parent | 1c6d508a2b9dd1dfaeb68b3443212b57190950d8 (diff) | |
| parent | 5fc5195fc5e5adfcbf63dd1297495e77399e2a32 (diff) | |
| download | mariadb-git-f5b73fe3f14de97370fa184378de9c27575dceae.tar.gz | |
Merge from 5.3.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 469e8d2ac1c..821f9359baf 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1579,6 +1579,8 @@ String *Item_func_substr_index::val_str(String *str) break; } } + if (count) + return res; // Didn't find, return org string } } /* |