diff options
| author | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
| commit | 7f158dd12a814e990454eee85fc5fea4d18a8d30 (patch) | |
| tree | 64a6fa388e4aab5527ee4bc81489d6cfac07fcf0 /sql/records.cc | |
| parent | 5b28d4a9a49a2d1c3225044b2cc82aa9e840687f (diff) | |
| parent | 6f6042462933c66f8af0503b32aa62e43f1aaf1f (diff) | |
| download | mariadb-git-7f158dd12a814e990454eee85fc5fea4d18a8d30.tar.gz | |
Merge 4.1 into 5.0
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc index 72a6d480356..facca3815fb 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -175,7 +175,7 @@ static int rr_sequential(READ_RECORD *info) { if (info->thd->killed) { - my_error(ER_SERVER_SHUTDOWN,MYF(0)); + info->thd->send_kill_message(); return 1; } if (tmp != HA_ERR_RECORD_DELETED) |