diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 17:46:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 17:46:46 +0100 |
| commit | 750b9147fced7202b541be946e044eb739b20a03 (patch) | |
| tree | cb378c2d311993254aec75d4d81a5f32a2dcb71d /storage/xtradb | |
| parent | a87eab6061068491ec9004ae54c46630619cb531 (diff) | |
| download | mariadb-git-750b9147fced7202b541be946e044eb739b20a03.tar.gz | |
remove thd_mark_as_hard_kill()
(because it's conceptually wrong. only the user can decide whether the kill is
allowed to leave tables in the inconsistent state, storage engine has no say in that)
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index ba07b414c65..a9f754c23cf 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -3779,7 +3779,7 @@ innobase_kill_query( /* Cancel a pending lock request. */ if (trx && trx->wait_lock) { - thd_mark_as_hard_kill(thd); + //trx->killed= 1; lock_cancel_waiting_and_release(trx->wait_lock); } |