diff options
| author | pem@mysql.com <> | 2003-09-24 11:29:38 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-09-24 11:29:38 +0200 |
| commit | 8d884c02bb2ca2f2b4bce6dccbaf69d6935e293d (patch) | |
| tree | 4f2fa31d20ec4c9a54f602c624b20c1cf4ddf493 /sql/lock.cc | |
| parent | efd94f5ba972bb10d2d10fe46fc9153536941e92 (diff) | |
| parent | b8e4dc03d809838f6f589ef24089e52ea806da33 (diff) | |
| download | mariadb-git-8d884c02bb2ca2f2b4bce6dccbaf69d6935e293d.tar.gz | |
Merging 4.1 -> 5.0
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index ea5e60b558f..69a00e79a73 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -154,7 +154,7 @@ retry: thd->proc_info=0; if (thd->killed) { - my_error(ER_SERVER_SHUTDOWN,MYF(0)); + thd->send_kill_message(); if (sql_lock) { mysql_unlock_tables(thd,sql_lock); |