From cc0904178b3972a7c9fba37bd98c9bbb576be1e9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Jun 2003 16:38:21 +0500 Subject: SCRUM client code added to the embedded library some fixes include/mysql.h: test code removed simple_command is the macrodefinition now libmysqld/embedded_priv.h: this declaration obsolete libmysqld/lib_sql.cc: errors stored in the same place for embedded and client libraries now sql-common/client.c: we don't need that ugly wrapper --- libmysqld/embedded_priv.h | 2 -- libmysqld/lib_sql.cc | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libmysqld') diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index abbebec2aaa..dfc06e38ab2 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -26,6 +26,4 @@ C_MODE_START extern void lib_connection_phase(NET *net, int phase); extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db); extern void *create_embedded_thd(int client_flag, char *db); -extern my_bool simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, - ulong length, my_bool skipp_check); C_MODE_END diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 6ba87d31268..73d5ca72654 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -74,7 +74,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, result= thd->net.last_errno ? -1 : 0; mysql->last_error= thd->net.last_error; - mysql->last_errno= thd->net.last_errno; + mysql->net.last_errno= thd->net.last_errno; + mysql->warning_count= ((THD*)mysql->thd)->total_warn_count; return result; } -- cgit v1.2.1