From 3814f2a8edf71a964cdbd8c965790d7216eff9fa Mon Sep 17 00:00:00 2001
From: unknown <hf@genie.(none)>
Date: Mon, 31 Mar 2003 13:39:46 +0500
Subject: SCRUM two KILL commands implementation (version 2)

include/mysqld_error.h:
  Error message about query interruption added
myisam/mi_check.c:
  killed_ptr now retutns only value - not pointer
myisam/myisamchk.c:
  killed_ptr returns value now
myisam/myisamdef.h:
  killed_ptr returns value now
myisam/sort.c:
  killed_ptr returns value now
sql/filesort.cc:
  THD::killed now has enum type
sql/ha_berkeley.cc:
  THD::killed has enum type
sql/ha_myisam.cc:
  killed_ptr returns value now
sql/lock.cc:
  two different errors possible here now
sql/log_event.cc:
  two ways of killing possible here now
sql/mysqld.cc:
  THD::killed has enum type now
sql/records.cc:
  two errors are possible here now
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
sql/slave.cc:
  two errors are possible here now
sql/sql_base.cc:
  THD::killed has enum type now
sql/sql_cache.cc:
  THD::killed has enum type now
sql/sql_class.cc:
  THD::awake implementation changed to handle KILL_QUERY
sql/sql_class.h:
  class THD changed to handle KILL_QUERY
sql/sql_delete.cc:
  two errors are possible here now
sql/sql_insert.cc:
  THD::killed has enum type now
sql/sql_load.cc:
  two errors are possible here now
sql/sql_parse.cc:
  kill_one_thread function changed to handle KILL_QUERY
sql/sql_prepare.cc:
  two errors are possible here now
sql/sql_repl.cc:
  the parameter to awake is of THD::killed_state type now
sql/sql_repl.h:
  awake parameter changed
sql/sql_select.cc:
  two errors are possible here now
sql/sql_show.cc:
  notification adopted to changes in class THD
sql/sql_table.cc:
  two errors are possible here now
sql/sql_update.cc:
  two errors are possible here now
---
 sql/lock.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/lock.cc')

diff --git a/sql/lock.cc b/sql/lock.cc
index 8f342b28d67..d2ad47cbbfa 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));
+    my_error(thd->killed, MYF(0));
     if (sql_lock)
     {
       mysql_unlock_tables(thd,sql_lock);
-- 
cgit v1.2.1


From 131d90001f2eca14d3497207b57fcd484c3f8927 Mon Sep 17 00:00:00 2001
From: unknown <hf@deer.mysql.r18.ru>
Date: Tue, 8 Apr 2003 19:18:33 +0500
Subject: SCRUM two KILL versions code trimming with headquarter's suggestions

myisam/mi_check.c:
  killed_ptr function changed backward
myisam/myisamchk.c:
  killed_ptr function changed backward
myisam/myisamdef.h:
  killed_ptr function changed backward
myisam/sort.c:
  killed_ptr function changed backward
sql/ha_myisam.cc:
  killed_ptr function changed backward
sql/lock.cc:
  error sending trimmed
sql/log_event.cc:
  error sending trimmed
sql/records.cc:
  error sending trimmed
sql/slave.cc:
  error sending trimmed
sql/sql_class.h:
  inline functions to send right message about killing added
sql/sql_delete.cc:
  error sending trimmed
sql/sql_load.cc:
  error sending trimmed
sql/sql_parse.cc:
  error sending trimmed
sql/sql_prepare.cc:
  error sending trimmed
sql/sql_select.cc:
  error sending trimmed
sql/sql_table.cc:
  error sending trimmed
sql/sql_update.cc:
  error sending trimmed
---
 sql/lock.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/lock.cc')

diff --git a/sql/lock.cc b/sql/lock.cc
index 9e399a364b2..45ffefed14f 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -154,7 +154,7 @@ retry:
   thd->proc_info=0;
   if (thd->killed)
   {
-    my_error(thd->killed, MYF(0));
+    thd->send_kill_message();
     if (sql_lock)
     {
       mysql_unlock_tables(thd,sql_lock);
-- 
cgit v1.2.1