diff options
| author | unknown <anozdrin/alik@quad.> | 2008-02-26 19:34:02 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.> | 2008-02-26 19:34:02 +0300 |
| commit | 6f67007c9a1c14b14c03d3e8a73853736d2e5388 (patch) | |
| tree | 4f6c2940e96b98c7499c2146e93e3ff920aed282 /sql/ha_ndbcluster_binlog.cc | |
| parent | a2ddb7cc781df02ab2a959f2749fefb67573c681 (diff) | |
| parent | bb7585d335f85ad9eb9fbf661664e6e65ac67a82 (diff) | |
| download | mariadb-git-6f67007c9a1c14b14c03d3e8a73853736d2e5388.tar.gz | |
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqltest.c:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manually merged.
mysql-test/t/disabled.def:
Manually merged.
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 fc1568a5ea6..4fd5ee1b402 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 |