From 0451af655234ed3f31e9cd651497e9849e94bc40 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jun 2003 10:34:09 +0500 Subject: Last part of resolving conflicts after pull Some intersections with Monty encountered libmysql/client_settings.h: We don't need the trick with macroses since Monty moved cli_mysql_use_result into sql-common/client.c libmysql/libmysql.c: mysql_use_result moved in sql-common/client.c sql-common/client.c: code simplified with the moving of mysql_use_result here sql/client_settings.h: we don't need this #define anymore sql/sql_client.cc: this function was moved to sql-common/pack.c by me i think the pack.c is the better place for it --- libmysql/client_settings.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libmysql/client_settings.h') diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index d4e8be84c48..43f341c7b1c 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -41,7 +41,3 @@ my_bool send_file_to_server(MYSQL *mysql, const char *filename); #define reset_sigpipe(mysql) #endif -#define CLI_MYSQL_USE_RESULT cli_mysql_use_result - -MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql); - -- cgit v1.2.1