diff options
| author | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-01-12 11:17:03 +0530 |
|---|---|---|
| committer | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-01-12 11:17:03 +0530 |
| commit | b4b960fccab758276fca994e40a279d2a1d6af74 (patch) | |
| tree | 5de03fd64acae21c1369c24c12a54fb1f88e0cf9 /client | |
| parent | b11fe1b83a1ccf4a0bf9962eafa6e3523c2160c1 (diff) | |
| parent | 3d9d0e7766d4195bbe40dbac8d85abcfe343beb0 (diff) | |
| download | mariadb-git-b4b960fccab758276fca994e40a279d2a1d6af74.tar.gz | |
BUG#11757250: REPLACE(...) INSIDE A STORED PROCEDURE.
Merge from 5.1 to 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index 0ad79ba5633..c404cc6b09f 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -691,7 +691,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; |