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

Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

Browse Source
This commit is contained in:
Davi Arnaut
2010-07-15 10:47:50 -03:00
parent 06b8897e8e 8df20918d6
commit 649390ac81
488 changed files with 12061 additions and 12284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/rpl_handler.cc
View File

@ -216,7 +216,7 @@ int Trans_delegate::after_commit(THD *thd, bool all)
if (is_real_trans && log_info)
{
my_pthread_setspecific_ptr(RPL_TRANS_BINLOG_INFO, NULL);
my_free(log_info, MYF(0));
my_free(log_info);
}
return ret;
}
@ -244,7 +244,7 @@ int Trans_delegate::after_rollback(THD *thd, bool all)
if (is_real_trans && log_info)
{
my_pthread_setspecific_ptr(RPL_TRANS_BINLOG_INFO, NULL);
my_free(log_info, MYF(0));
my_free(log_info);
}
return ret;
}