database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

renamed exported function mysql_reconnect to mariadb_reconnect

Browse Source
This commit is contained in:
Georg Richter
2016-02-24 08:26:34 +01:00
parent d316a29eee
commit f7d7730bc1
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h
View File

@@ -570,7 +570,7 @@ unsigned long STDCALL mysql_hex_string(char *to, const char *from, size_t len);
my_socket STDCALL mysql_get_socket(MYSQL *mysql); my_socket STDCALL mysql_get_socket(MYSQL *mysql);
unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
my_bool STDCALL mysql_reconnect(MYSQL *mysql); my_bool STDCALL mariadb_reconnect(MYSQL *mysql);
/* Async API */ /* Async API */
int STDCALL mysql_close_start(MYSQL *sock); int STDCALL mysql_close_start(MYSQL *sock);
@@ -768,7 +768,7 @@ struct st_mariadb_api {
my_socket (STDCALL *mysql_get_socket)(MYSQL *mysql); my_socket (STDCALL *mysql_get_socket)(MYSQL *mysql);
unsigned int (STDCALL *mysql_get_timeout_value)(const MYSQL *mysql); unsigned int (STDCALL *mysql_get_timeout_value)(const MYSQL *mysql);
unsigned int (STDCALL *mysql_get_timeout_value_ms)(const MYSQL *mysql); unsigned int (STDCALL *mysql_get_timeout_value_ms)(const MYSQL *mysql);
my_bool (STDCALL *mysql_reconnect)(MYSQL *mysql); my_bool (STDCALL *mariadb_reconnect)(MYSQL *mysql);
MYSQL_STMT * (STDCALL *mysql_stmt_init)(MYSQL *mysql); MYSQL_STMT * (STDCALL *mysql_stmt_init)(MYSQL *mysql);
int (STDCALL *mysql_stmt_prepare)(MYSQL_STMT *stmt, const char *query, size_t length); int (STDCALL *mysql_stmt_prepare)(MYSQL_STMT *stmt, const char *query, size_t length);
int (STDCALL *mysql_stmt_execute)(MYSQL_STMT *stmt); int (STDCALL *mysql_stmt_execute)(MYSQL_STMT *stmt);

10
libmariadb/mariadb_lib.c
View File

@@ -149,7 +149,7 @@ struct st_mariadb_methods MARIADB_DEFAULT_METHODS;
static void end_server(MYSQL *mysql); static void end_server(MYSQL *mysql);
static void mysql_close_memory(MYSQL *mysql); static void mysql_close_memory(MYSQL *mysql);
void read_user_name(char *name); void read_user_name(char *name);
my_bool STDCALL mysql_reconnect(MYSQL *mysql); my_bool STDCALL mariadb_reconnect(MYSQL *mysql);
static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length); static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length);
extern int mysql_client_plugin_init(); extern int mysql_client_plugin_init();
@@ -381,7 +381,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
if (mysql->net.pvio == 0) if (mysql->net.pvio == 0)
{ /* Do reconnect if possible */ { /* Do reconnect if possible */
if (mysql_reconnect(mysql)) if (mariadb_reconnect(mysql))
{ {
return(1); return(1);
} }
@@ -417,7 +417,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
goto end; goto end;
} }
end_server(mysql); end_server(mysql);
if (mysql_reconnect(mysql)) if (mariadb_reconnect(mysql))
goto end; goto end;
if (ma_net_write_command(net,(uchar) command,arg, if (ma_net_write_command(net,(uchar) command,arg,
length ? length : (ulong) strlen(arg))) length ? length : (ulong) strlen(arg)))
@@ -1549,7 +1549,7 @@ my_suspend_hook(my_bool suspend, void *data)
} }
#endif #endif
my_bool STDCALL mysql_reconnect(MYSQL *mysql) my_bool STDCALL mariadb_reconnect(MYSQL *mysql)
{ {
MYSQL tmp_mysql; MYSQL tmp_mysql;
#ifdef HAVE_NONBLOCK #ifdef HAVE_NONBLOCK
@@ -3767,7 +3767,7 @@ struct st_mariadb_api MARIADB_API=
mysql_get_socket, mysql_get_socket,
mysql_get_timeout_value, mysql_get_timeout_value,
mysql_get_timeout_value_ms, mysql_get_timeout_value_ms,
mysql_reconnect, mariadb_reconnect,
mysql_stmt_init, mysql_stmt_init,
mysql_stmt_prepare, mysql_stmt_prepare,
mysql_stmt_execute, mysql_stmt_execute,

1
mariadb_config/mariadb_config.c.in
View File

@@ -2,6 +2,7 @@
#include <ma_sys.h> #include <ma_sys.h>
#include <getopt.h> #include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <mariadb_version.h>
static char *mariadb_progname; static char *mariadb_progname;