1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Last part of resolving conflicts after pull

Some intersections with Monty encountered
This commit is contained in:
hf@deer.(none)
2003-06-18 10:34:09 +05:00
parent b82e89d872
commit 66ecacb3c3
5 changed files with 6 additions and 64 deletions

View File

@@ -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);