mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
5.5 merge
This commit is contained in:
@ -40,6 +40,7 @@ C_MODE_START
|
||||
extern unsigned int mysql_server_last_errno;
|
||||
extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
|
||||
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)
|
||||
@ -107,6 +108,17 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
||||
NET *net= &mysql->net;
|
||||
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)
|
||||
{
|
||||
/* Do "reconnect" if possible */
|
||||
@ -1286,7 +1298,7 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol::net_store_data(const uchar *from, size_t length,
|
||||
bool Protocol::net_store_data_cs(const uchar *from, size_t length,
|
||||
CHARSET_INFO *from_cs, CHARSET_INFO *to_cs)
|
||||
{
|
||||
uint conv_length= to_cs->mbmaxlen * length / from_cs->mbminlen;
|
||||
|
Reference in New Issue
Block a user