diff options
| author | unknown <guilhem@mysql.com> | 2004-12-09 15:42:06 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-12-09 15:42:06 +0100 |
| commit | a5286aa9a19adbd9d3f9165337f4f85fc874036e (patch) | |
| tree | f8203ab68b870c6af4e37a9ec22a0759602d99dd /libmysql/libmysql.c | |
| parent | 89e77b65cd6999d1b6567f1744fbd35659d9d7b7 (diff) | |
| parent | 40c2a8870b7dea27917430d995a0acb91465b892 (diff) | |
| download | mariadb-git-a5286aa9a19adbd9d3f9165337f4f85fc874036e.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index dc0ef57e910..fbaa22cff14 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -317,6 +317,7 @@ my_bool STDCALL mysql_master_send_query(MYSQL *mysql, const char *q, DBUG_ENTER("mysql_master_send_query"); if (!master->net.vio && !mysql_real_connect(master,0,0,0,0,0,0,0)) DBUG_RETURN(1); + master->reconnect= 1; mysql->last_used_con = master; DBUG_RETURN(simple_command(master, COM_QUERY, q, length, 1)); } @@ -351,6 +352,7 @@ my_bool STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q, if (!slave_to_use->net.vio && !mysql_real_connect(slave_to_use, 0,0,0, 0,0,0,0)) DBUG_RETURN(1); + slave_to_use->reconnect= 1; DBUG_RETURN(simple_command(slave_to_use, COM_QUERY, q, length, 1)); } @@ -448,6 +450,7 @@ static my_bool get_slaves_from_master(MYSQL* mysql) expand_error(mysql, CR_PROBE_MASTER_CONNECT); DBUG_RETURN(1); } + mysql->reconnect= 1; if (mysql_query(mysql, "SHOW SLAVE HOSTS") || !(res = mysql_store_result(mysql))) @@ -615,6 +618,7 @@ mysql_connect(MYSQL *mysql,const char *host, if (mysql->free_me) my_free((gptr) mysql,MYF(0)); } + mysql->reconnect= 1; DBUG_RETURN(res); } } |