diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /sql/sql_string.cc | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
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 21748861204..f1cb5e07eca 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -758,7 +758,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; |