diff options
| author | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-03-13 16:29:11 +0530 |
|---|---|---|
| committer | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-03-13 16:29:11 +0530 |
| commit | 6947da5cf544c75579837245d10b7faa3ff4ceb6 (patch) | |
| tree | 26b2c60d3798c0f2d3cec0a230eba78af4a80322 /client | |
| parent | 59bc951a1fce42ccbaf4099171c815493ad4dde1 (diff) | |
| parent | 58ad37dcadaecf94518cccf152125ac5835b017c (diff) | |
| download | mariadb-git-6947da5cf544c75579837245d10b7faa3ff4ceb6.tar.gz | |
BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE
COLUMNS ARE USED INSIDE A STORED PROCEDURE
Merging post-push fix from mysql-5.1
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 0b92c370858..4b84ccd2387 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -1,7 +1,7 @@ #ifndef CLIENT_SQL_STRING_INCLUDED #define CLIENT_SQL_STRING_INCLUDED -/* 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 @@ -225,6 +225,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; |