diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /sql/rpl_handler.cc | |
| parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'sql/rpl_handler.cc')
| -rw-r--r-- | sql/rpl_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index a7b963d186c..5d2a3f61b1e 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -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; } |