diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-06-21 12:04:13 +0500 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-06-21 12:04:13 +0500 |
| commit | 8a6b7f7cca8a1235921f816c7f6eb669d1e25f72 (patch) | |
| tree | e3186af3614e9aec36096043313b07d0be16b452 /sql/log_event.cc | |
| parent | 1b5d893122ca966b1e6246a7586877ef69497ceb (diff) | |
| parent | 3b08919f6afe89416465c77ab7d854a7c85dcb78 (diff) | |
| download | mariadb-git-8a6b7f7cca8a1235921f816c7f6eb669d1e25f72.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/28839/my50-28839
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 0f150eeaf2d..91628c0486c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1968,6 +1968,7 @@ Default database: '%s'. Query: '%s'", { DBUG_PRINT("info",("error ignored")); clear_all_errors(thd, rli); + thd->killed= THD::NOT_KILLED; } /* Other cases: mostly we expected no error and get one. |