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 | |
| 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')
| -rw-r--r-- | sql/client_settings.h | 1 | ||||
| -rw-r--r-- | sql/sql_client.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index 5a16fdd1c2f..b357e52ec9d 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -30,6 +30,5 @@ #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 #undef HAVE_SMEM -#define CLI_MYSQL_USE_RESULT NULL #undef _CUSTOMCONFIG_ diff --git a/sql/sql_client.cc b/sql/sql_client.cc index 464596f0734..a6a8a6305ed 100644 --- a/sql/sql_client.cc +++ b/sql/sql_client.cc @@ -20,6 +20,7 @@ #include <mysql_priv.h> +#ifdef CLEAN_DUP /* Function called by my_net_init() to set some check variables */ @@ -37,6 +38,7 @@ void my_net_local_init(NET *net) #endif } } +#endif /*CLEAN_DUP*/ extern "C" { void mysql_once_init(void) |