database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

bzr merge -r3997..4010 codership-mysql/5.5

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-08-06 15:45:53 -04:00
parent ec91eea8db
commit 4788577c20
14 changed files with 136 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -993,6 +993,9 @@ static void wsrep_copy_query(THD *thd)
{
thd->wsrep_retry_command = thd->command;
thd->wsrep_retry_query_len = thd->query_length();
if (thd->wsrep_retry_query) {
my_free(thd->wsrep_retry_query);
}
thd->wsrep_retry_query = (char *)my_malloc(
thd->wsrep_retry_query_len + 1, MYF(0));
strncpy(thd->wsrep_retry_query, thd->query(), thd->wsrep_retry_query_len);