diff options
| author | hf@deer.(none) <> | 2003-06-18 10:34:09 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-06-18 10:34:09 +0500 |
| commit | 66ecacb3c36f5fbe81f02b3594a3cc96a2afeea1 (patch) | |
| tree | c7c363a4269828e42d8b8818c5c01e520b608dd5 /libmysql/client_settings.h | |
| parent | b82e89d872402ceadb9c68ab85c4387f01e609cf (diff) | |
| download | mariadb-git-66ecacb3c36f5fbe81f02b3594a3cc96a2afeea1.tar.gz | |
Last part of resolving conflicts after pull
Some intersections with Monty encountered
Diffstat (limited to 'libmysql/client_settings.h')
| -rw-r--r-- | libmysql/client_settings.h | 4 |
1 files changed, 0 insertions, 4 deletions
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); - |