diff options
| author | unknown <hf@deer.(none)> | 2003-06-18 10:34:09 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-18 10:34:09 +0500 |
| commit | 4c7431dc906cd5e5dba8515ec63107b590708898 (patch) | |
| tree | c7c363a4269828e42d8b8818c5c01e520b608dd5 /sql-common | |
| parent | 46cb15ccd477007c8ba2abaa90f86960a8adc7bd (diff) | |
| download | mariadb-git-4c7431dc906cd5e5dba8515ec63107b590708898.tar.gz | |
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
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index b70aed2d2c2..7d82ff0d209 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -60,10 +60,6 @@ my_bool net_flush(NET *net); #define CLI_MYSQL_REAL_CONNECT mysql_real_connect #endif /*EMBEDDED_LIBRARY*/ -#ifdef MYSQL_CLIENT -static my_bool mysql_client_init=0; -#endif - #if !defined(MYSQL_SERVER) && (defined(__WIN__) || defined(_WIN32) || defined(_WIN64)) #include <winsock.h> @@ -1441,6 +1437,7 @@ error: static void STDCALL cli_mysql_close(MYSQL *mysql); static my_bool STDCALL cli_mysql_read_query_result(MYSQL *mysql); static MYSQL_RES * STDCALL cli_mysql_store_result(MYSQL *mysql); +static MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql); static MYSQL_METHODS client_methods= { @@ -1448,7 +1445,7 @@ static MYSQL_METHODS client_methods= cli_mysql_read_query_result, cli_advanced_command, cli_mysql_store_result, - CLI_MYSQL_USE_RESULT + cli_mysql_use_result }; MYSQL * STDCALL @@ -2378,8 +2375,7 @@ static MYSQL_RES * STDCALL cli_mysql_store_result(MYSQL *mysql) have to wait for the client (and will not wait more than 30 sec/packet). **************************************************************************/ -MYSQL_RES * STDCALL -mysql_use_result(MYSQL *mysql) +static MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql) { MYSQL_RES *result; DBUG_ENTER("mysql_use_result"); |