diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /sql/item_strfunc.cc | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
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 e22718029e5..7c1c5f7da7d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1564,7 +1564,7 @@ String *Item_func_insert::val_str(String *str) length= res->charpos((int) length, (uint32) start); /* Re-testing with corrected params */ - if (start > res->length()) + if (start + 1 > res->length()) // remember, start = args[1].val_int() - 1 return res; /* purecov: inspected */ // Wrong param; skip insert if (length > res->length() - start) length= res->length() - start; |