diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-12-10 00:19:52 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-12-10 00:19:52 +0200 |
| commit | 07cebc14254fbf36d83f9eaad81d91e87ecf8cc7 (patch) | |
| tree | f4938fc4c7c989c6fa00c63a1de65340c68f8f1f /sql/item_strfunc.cc | |
| parent | c4be610466b4af0ba9a88d76f951948d77815134 (diff) | |
| parent | 41a61e84d724e48f6d1e026e7f79469b55ac230c (diff) | |
| download | mariadb-git-07cebc14254fbf36d83f9eaad81d91e87ecf8cc7.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
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 a58e00a1b39..aaeeb9d8bb8 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -954,8 +954,9 @@ String *Item_func_left::val_str(String *str) if (res->length() <= (uint) length || res->length() <= (char_pos= res->charpos(length))) return res; - str_value.set(*res, 0, char_pos); - return &str_value; + + tmp_value.set(*res, 0, char_pos); + return &tmp_value; } |