diff options
| author | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-03-13 16:24:35 +0530 |
|---|---|---|
| committer | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-03-13 16:24:35 +0530 |
| commit | 58ad37dcadaecf94518cccf152125ac5835b017c (patch) | |
| tree | bcea007215154d106e94575d79995e8b1158d5f4 /client | |
| parent | 441e5405656e3e57b5dbac436633a274f2757b2e (diff) | |
| download | mariadb-git-58ad37dcadaecf94518cccf152125ac5835b017c.tar.gz | |
BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE
COLUMNS ARE USED INSIDE A STORED PROCEDURE
Post-push fix.
String::operator=() in client/sql_string.h also
needs to be updated with fix.
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/sql_string.h b/client/sql_string.h index 57d4d196e8c..8f935291b43 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -228,6 +228,7 @@ public: DBUG_ASSERT(!s.uses_buffer_owned_by(this)); free(); Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length; + str_charset=s.str_charset; alloced=0; } return *this; |