diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-20 14:16:55 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-20 14:16:55 +0500 |
| commit | e49e9d57ccc3097df43f4b7abae8ea0b00d39ba1 (patch) | |
| tree | 7d2015d2af1fa49a91214081b1a23c6c6ae13a55 /sql/log_event.cc | |
| parent | 318b8814130e885c20cd3631e73c995ca02dfbdf (diff) | |
| parent | d5cc204e5829ce07276a1564d397be5f44ee92ca (diff) | |
| download | mariadb-git-e49e9d57ccc3097df43f4b7abae8ea0b00d39ba1.tar.gz | |
Merge mysql.com:/home/hf/work/28839/my50-28839
into mysql.com:/home/hf/work/28839/my51-28839
mysql-test/r/rpl_skip_error.result:
Auto merged
mysql-test/t/rpl_skip_error.test:
Auto merged
sql/log_event.cc:
merging
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 50a5400e04f..4878994d0a7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2139,6 +2139,7 @@ Default database: '%s'. Query: '%s'", { DBUG_PRINT("info",("error ignored")); clear_all_errors(thd, const_cast<RELAY_LOG_INFO*>(rli)); + thd->killed= THD::NOT_KILLED; } /* Other cases: mostly we expected no error and get one. |