diff options
| author | mkindahl@dl145h.mysql.com <> | 2007-12-19 18:51:46 +0100 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2007-12-19 18:51:46 +0100 |
| commit | bdea24f48358db2a7e6a74a7beba64b245b484ab (patch) | |
| tree | b4347d5d5af8e563fdef89ebf94232b92415803c /sql/rpl_rli.cc | |
| parent | 16f0bd712e184deda90f91a0e9ec2a13a6db22bf (diff) | |
| parent | fabaa50cd969dc8be45cd3679389c4edef34e403 (diff) | |
| download | mariadb-git-bdea24f48358db2a7e6a74a7beba64b245b484ab.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 3467f6fd67c..0411b01b0cd 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1160,6 +1160,11 @@ void Relay_log_info::cleanup_context(THD *thd, bool error) close_thread_tables(thd); clear_tables_to_lock(); clear_flag(IN_STMT); + /* + Cleanup for the flags that have been set at do_apply_event. + */ + thd->options&= ~OPTION_NO_FOREIGN_KEY_CHECKS; + thd->options&= ~OPTION_RELAXED_UNIQUE_CHECKS; last_event_start_time= 0; DBUG_VOID_RETURN; } |