database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
This commit is contained in:
ndbdev@dl145b.mysql.com
2005-05-09 20:28:54 +02:00
parent 328c5a2a81 2ae1faaf4b
commit 58aa78e32d
49 changed files with 235 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -1437,9 +1437,6 @@ bool do_command(THD *thd)
}
else
{
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
thd->killed= THD::NOT_KILLED;
packet=(char*) net->read_pos;
command = (enum enum_server_command) (uchar) packet[0];
if (command >= COM_END)
@ -1486,6 +1483,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
bool error= 0;
DBUG_ENTER("dispatch_command");
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
thd->killed= THD::NOT_KILLED;
thd->command=command;
/*
Commands which will always take a long time should be marked with