mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE
COLUMNS ARE USED INSIDE A STORED PROCEDURE Merging post-push fix from mysql-5.1
This commit is contained in:
@ -1,7 +1,7 @@
|
|||||||
#ifndef CLIENT_SQL_STRING_INCLUDED
|
#ifndef CLIENT_SQL_STRING_INCLUDED
|
||||||
#define 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
|
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
|
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));
|
DBUG_ASSERT(!s.uses_buffer_owned_by(this));
|
||||||
free();
|
free();
|
||||||
Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
|
Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
|
||||||
|
str_charset=s.str_charset;
|
||||||
alloced=0;
|
alloced=0;
|
||||||
}
|
}
|
||||||
return *this;
|
return *this;
|
||||||
|
Reference in New Issue
Block a user