diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-11 07:26:58 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-11 07:26:58 +0100 |
| commit | c2db8a7ffc9eb971708db03a8c1c5f9645ea5ac6 (patch) | |
| tree | 45ede758be8668f99f147a3cda9ba47d9190eae6 /sql/rpl_injector.cc | |
| parent | a264a79eb769bb156e9fa9f96025272ef48f6395 (diff) | |
| parent | 9376ec63366fac379c9c9fc90dd1dc1a43872134 (diff) | |
| download | mariadb-git-c2db8a7ffc9eb971708db03a8c1c5f9645ea5ac6.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
Diffstat (limited to 'sql/rpl_injector.cc')
| -rw-r--r-- | sql/rpl_injector.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index a69cfc2b75f..265f5f61213 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -43,6 +43,9 @@ injector::transaction::transaction(MYSQL_LOG *log, THD *thd) injector::transaction::~transaction() { + if (!good()) + return; + /* Needed since my_free expects a 'char*' (instead of 'void*'). */ char* const the_memory= const_cast<char*>(m_start_pos.m_file_name); |