diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
| commit | b381cf843c841151f96541b19bd753cd3bbae326 (patch) | |
| tree | dfc377a1dfbd4d2044a0b799ff5ed6411c7e864f /sql/sql_string.cc | |
| parent | d4be9e7bc0cfd5ddd444ecc64daa4166597ca2eb (diff) | |
| parent | e5055e22f1f311fa48457cfcc97b72e93a37329f (diff) | |
| download | mariadb-git-b381cf843c841151f96541b19bd753cd3bbae326.tar.gz | |
mysql-5.5.31 merge
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 4aba2ee51c5..4f3ec940cef 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -732,7 +732,7 @@ String *copy_if_not_alloced(String *to,String *from,uint32 from_length) { if (from->Alloced_length >= from_length) return from; - if (from->alloced || !to || from == to) + if ((from->alloced && (from->Alloced_length != 0)) || !to || from == to) { (void) from->realloc(from_length); return from; |