diff options
| author | unknown <kostja@dipika.(none)> | 2008-02-19 14:53:22 +0300 |
|---|---|---|
| committer | unknown <kostja@dipika.(none)> | 2008-02-19 14:53:22 +0300 |
| commit | b794d7b7825d0c66defc1bac23ac31ca5e0ca04b (patch) | |
| tree | 04e23b57dfe474c6eec621c1ff38cbb47a67058c /sql/ha_ndbcluster_binlog.cc | |
| parent | 31b1bc985feca22c66049bba277ad962c5be66c4 (diff) | |
| parent | 1745446d6c692843b561fb304476eafb9000a42e (diff) | |
| download | mariadb-git-b794d7b7825d0c66defc1bac23ac31ca5e0ca04b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into dipika.(none):/opt/local/work/mysql-5.1-2pc-opt-merge-push
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manual merge.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 841dce2d832..ba8c1ed0c18 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -283,6 +283,7 @@ static void run_query(THD *thd, char *buf, char *end, thd_ndb->m_error_code, (int) thd->is_error(), thd->is_slave_error); } + close_thread_tables(thd); /* XXX: this code is broken. mysql_parse()/mysql_reset_thd_for_next_command() can not be called from within a statement, and |