diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
| commit | 06b7fce9f24116080168b924d17f71b979fc3a14 (patch) | |
| tree | 5ff9f5684bb118abbee5a9fd3b838d0841661287 /sql/log_event.cc | |
| parent | 1f2ff25eba6c089b2698cd0dab96155ccbf2afd2 (diff) | |
| parent | 8494039757a2f6353cc161e7824aab4fe2312d2a (diff) | |
| download | mariadb-git-06b7fce9f24116080168b924d17f71b979fc3a14.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index b1cf6a9024a..9515e5c04a7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6025,7 +6025,6 @@ int Load_log_event::do_apply_event(NET* net, rpl_group_info *rgi, new_db.str= (char *) rpl_filter->get_rewrite_db(db, &new_db.length); thd->set_db(new_db.str, new_db.length); DBUG_ASSERT(thd->query() == 0); - thd->reset_query_inner(); // Should not be needed thd->is_slave_error= 0; clear_all_errors(thd, const_cast<Relay_log_info*>(rli)); |