database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity

Fix for bug #9632 (strict.test fails in -embedded-server mode)

Browse Source 
libmysqld/libmysqld.c:
  we need this code before we create thd instance
sql/sql_parse.cc:
  dispatch_command is the more appropriate place for this code
This commit is contained in:
unknown
2005-05-09 16:26:06 +05:00
parent 848611b5ed
commit 59f6cf25f5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -1433,9 +1433,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)
@@ -1482,6 +1479,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