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

fix for #1219

Browse Source
This commit is contained in:
hf@deer.(none)
2003-09-08 18:49:23 +05:00
parent cf0c41aab4
commit 90bd948e1e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libmysqld/lib_sql.cc
View File

@ -37,6 +37,7 @@ char server_inited;
C_MODE_START C_MODE_START
#include <mysql.h> #include <mysql.h>
#undef ER
#include "errmsg.h" #include "errmsg.h"
#include <sql_common.h> #include <sql_common.h>
@ -55,12 +56,13 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
{ {
my_bool result= 1; my_bool result= 1;
THD *thd=(THD *) mysql->thd; THD *thd=(THD *) mysql->thd;
NET *net= &mysql->net;
/* Check that we are calling the client functions in right order */ /* Check that we are calling the client functions in right order */
if (mysql->status != MYSQL_STATUS_READY) if (mysql->status != MYSQL_STATUS_READY)
{ {
strmov(thd->net.last_error, strmov(net->last_error,
ER(thd->net.last_errno=CR_COMMANDS_OUT_OF_SYNC)); ER(net->last_errno=CR_COMMANDS_OUT_OF_SYNC));
return 1; return 1;
} }
@ -76,12 +78,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if (!skip_check) if (!skip_check)
result= thd->net.last_errno ? -1 : 0; result= thd->net.last_errno ? -1 : 0;
if ((mysql->net.last_errno= thd->net.last_errno)) if ((net->last_errno= thd->net.last_errno))
{ {
memcpy(mysql->net.last_error, thd->net.last_error, memcpy(net->last_error, net->last_error,
sizeof(mysql->net.last_error)); sizeof(net->last_error));
memcpy(mysql->net.sqlstate, thd->net.sqlstate, memcpy(net->sqlstate, thd->net.sqlstate,
sizeof(mysql->net.sqlstate)); sizeof(net->sqlstate));
} }
mysql->warning_count= ((THD*)mysql->thd)->total_warn_count; mysql->warning_count= ((THD*)mysql->thd)->total_warn_count;
return result; return result;