mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

SCRUM

Browse source 
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
This commit is contained in:
unknown 2003-03-31 13:39:46 +05:00
commit 3814f2a8ed
51 changed files with 93 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_load.cc
View file

@ -379,7 +379,7 @@ read_fixed_length(THD *thd,COPY_INFO &info,TABLE *table,List<Item> &fields,
{
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));
my_error(thd->killed,MYF(0));
DBUG_RETURN(1);
}
it.rewind();
@ -453,7 +453,7 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table,
{
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));
my_error(thd->killed,MYF(0));
DBUG_RETURN(1);
}
while ((sql_field=(Item_field*) it++))