diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-18 17:08:56 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-18 17:08:56 +0500 |
| commit | 751e32072f260a39d9c1b4ca2a5d80fff13ad925 (patch) | |
| tree | 5a3f0331e4c22301ccc757da3090d947ac0d598d /sql/item_strfunc.cc | |
| parent | 200c69e3e6dd7a59796f1fd1ac78f90ec402a6c3 (diff) | |
| parent | 6e315bfae2fdd147c901647bb28ed09359aa0add (diff) | |
| download | mariadb-git-751e32072f260a39d9c1b4ca2a5d80fff13ad925.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 3dc352338a4..a376504512f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1143,8 +1143,9 @@ String *Item_func_substr::val_str(String *str) (arg_count == 3 && args[2]->null_value)))) return 0; /* purecov: inspected */ - /* Negative length, will return empty string. */ - if ((arg_count == 3) && (length <= 0) && !args[2]->unsigned_flag) + /* Negative or zero length, will return empty string. */ + if ((arg_count == 3) && (length <= 0) && + (length == 0 || !args[2]->unsigned_flag)) return &my_empty_string; /* Assumes that the maximum length of a String is < INT_MAX32. */ |