diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-21 12:04:13 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-21 12:04:13 +0500 |
| commit | 8c353de9572b499c7905b0997740f9ac514c7e5a (patch) | |
| tree | e3186af3614e9aec36096043313b07d0be16b452 /sql/log_event.cc | |
| parent | b5eb3fcb821d8dd6a105257b16eed61f168cf5cb (diff) | |
| parent | d5cc204e5829ce07276a1564d397be5f44ee92ca (diff) | |
| download | mariadb-git-8c353de9572b499c7905b0997740f9ac514c7e5a.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/28839/my50-28839
sql/log_event.cc:
Auto merged
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. |