database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Last part of resolving conflicts after pull

Browse Source 
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
This commit is contained in:
unknown
2003-06-18 10:34:09 +05:00
parent 46cb15ccd4
commit 4c7431dc90
5 changed files with 6 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/client_settings.h
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);