BUG#11757250: REPLACE(...) INSIDE A STORED PROCEDURE.

Merge from 5.1 to 5.5

BUG#11757250: REPLACE(...) INSIDE A STORED PROCEDURE.
Merge from 5.1 to 5.5
b4b960fc · Nisha Gopalakrishnan · b11fe1b8 · 3d9d0e77 · b4b960fc · b4b960fc
Commit b4b960fc authored Jan 12, 2013 by Nisha Gopalakrishnan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

client/sql_string.cc client/sql_string.cc +1 -1

sql/sql_string.cc sql/sql_string.cc +1 -1

No files found.
--- 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;

--- 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;