database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-5138 Numerous test failures in "mtr --ps --embedded".

Browse Source 
Thread can be disconnected internally for example after COMMIT statements.
     So we should check this for the statement execution.
This commit is contained in:
Alexey Botchkov
2014-04-15 18:16:47 +05:00
parent 8a6a95a111
commit 9d32b8b2aa
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libmysqld/lib_sql.cc
View File

@ -40,6 +40,7 @@ C_MODE_START
extern unsigned int mysql_server_last_errno; extern unsigned int mysql_server_last_errno;
extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE]; extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
static my_bool emb_read_query_result(MYSQL *mysql); static my_bool emb_read_query_result(MYSQL *mysql);
static void emb_free_embedded_thd(MYSQL *mysql);
extern "C" void unireg_clear(int exit_code) extern "C" void unireg_clear(int exit_code)
@ -107,6 +108,17 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
NET *net= &mysql->net; NET *net= &mysql->net;
my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE; my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE;
if (thd->killed != NOT_KILLED)
{
if (thd->killed < KILL_CONNECTION)
thd->killed= NOT_KILLED;
else
{
emb_free_embedded_thd(mysql);
thd= 0;
}
}
if (!thd) if (!thd)
{ {
/* Do "reconnect" if possible */ /* Do "reconnect" if possible */