diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-03-16 11:47:15 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-03-16 11:47:15 +0000 |
| commit | cc223d38831e90d37d0f1f7ebe97cf7c71af4774 (patch) | |
| tree | 64df355e06f3fbadbcfe55f840a51aa019885680 /sql | |
| parent | 0ed46845479e5d1f995ee6c16cdad7dd4cb43317 (diff) | |
| parent | 7768ccbb54114e8ca35287fbcb14615f81a88783 (diff) | |
| download | mariadb-git-cc223d38831e90d37d0f1f7ebe97cf7c71af4774.tar.gz | |
Automerge: mysql-5.1-bugteam bug branch --> mysql-5.1-bugteam latest.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index b7313a988c4..b75650cfec7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4679,7 +4679,7 @@ int query_error_code(THD *thd, bool not_killed) { int error; - if (not_killed) + if (not_killed || (thd->killed == THD::KILL_BAD_DATA)) { error= thd->is_error() ? thd->main_da.sql_errno() : 0; |