diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
| commit | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch) | |
| tree | 568cd8f2997888d5c1035ad8e9b5e823197dcf62 /sql/log.cc | |
| parent | b0ee31c89480519490537b89dca1e8cc65e2b73b (diff) | |
| parent | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff) | |
| download | mariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 1aea7a33e0d..c1e0370613f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2009, 2013, Monty Program Ab 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 @@ -4473,6 +4474,8 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd, if (pending->write(&trx_data->trans_log)) { set_write_error(thd); + delete pending; + trx_data->set_pending(NULL); DBUG_RETURN(1); } } @@ -4485,6 +4488,8 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd, { pthread_mutex_unlock(&LOCK_log); set_write_error(thd); + delete pending; + trx_data->set_pending(NULL); DBUG_RETURN(1); } |