1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it possible to change reconnect setting with

Browse Source 
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
This commit is contained in:
jimw@mysql.com 2005-07-06 16:29:31 -07:00
parent 7d7a59e46f
commit bef1c77789
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
client/mysqltest.c
View File

@ -1731,14 +1731,15 @@ int safe_connect(MYSQL* con, const char* host, const char* user,
const char* pass, const char* pass,
const char* db, int port, const char* sock) const char* db, int port, const char* sock)
{ {
int con_error = 1; int con_error= 1;
my_bool reconnect= 1;
int i; int i;
for (i = 0; i < MAX_CON_TRIES; ++i) for (i= 0; i < MAX_CON_TRIES; ++i)
{ {
if (mysql_real_connect(con, host,user, pass, db, port, sock, if (mysql_real_connect(con, host,user, pass, db, port, sock,
CLIENT_MULTI_STATEMENTS)) CLIENT_MULTI_STATEMENTS))
{ {
con_error = 0; con_error= 0;
break; break;
} }
sleep(CON_RETRY_SLEEP); sleep(CON_RETRY_SLEEP);
@ -1747,7 +1748,7 @@ int safe_connect(MYSQL* con, const char* host, const char* user,
TODO: change this to 0 in future versions, but the 'kill' test relies on TODO: change this to 0 in future versions, but the 'kill' test relies on
existing behavior existing behavior
*/ */
con->reconnect= 1; mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);
return con_error; return con_error;
} }
@ -1781,6 +1782,7 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
int* create_conn) int* create_conn)
{ {
DYNAMIC_STRING ds_tmp, *ds; DYNAMIC_STRING ds_tmp, *ds;
my_bool reconnect= 1;
int error= 0; int error= 0;
/* /*
@ -1846,7 +1848,7 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
TODO: change this to 0 in future versions, but the 'kill' test relies on TODO: change this to 0 in future versions, but the 'kill' test relies on
existing behavior existing behavior
*/ */
con->reconnect= 1; mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);
if (record) if (record)
{ {
@ -2090,6 +2092,7 @@ int read_line(char* buf, int size)
enum {R_NORMAL, R_Q, R_Q_IN_Q, R_SLASH_IN_Q, enum {R_NORMAL, R_Q, R_Q_IN_Q, R_SLASH_IN_Q,
R_COMMENT, R_LINE_START} state= R_LINE_START; R_COMMENT, R_LINE_START} state= R_LINE_START;
DBUG_ENTER("read_line"); DBUG_ENTER("read_line");
LINT_INIT(quote);
start_lineno= *lineno; start_lineno= *lineno;
for (; p < buf_end ;) for (; p < buf_end ;)
@ -2772,6 +2775,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if (!disable_result_log) if (!disable_result_log)
{ {
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */ ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
LINT_INIT(affected_rows);
if (res) if (res)
{ {
@ -3924,7 +3928,7 @@ int main(int argc, char **argv)
select_connection(q->first_argument); select_connection(q->first_argument);
else else
{ {
char buf[] = "slave"; char buf[]= "slave";
select_connection(buf); select_connection(buf);
} }
do_sync_with_master2(""); do_sync_with_master2("");
@ -3936,7 +3940,7 @@ int main(int argc, char **argv)
case Q_PING: case Q_PING:
(void) mysql_ping(&cur_con->mysql); (void) mysql_ping(&cur_con->mysql);
break; break;
case Q_EXEC: case Q_EXEC:
do_exec(q); do_exec(q);
break; break;
case Q_START_TIMER: case Q_START_TIMER:
@ -3948,7 +3952,7 @@ int main(int argc, char **argv)
timer_output(); timer_output();
got_end_timer= TRUE; got_end_timer= TRUE;
break; break;
case Q_CHARACTER_SET: case Q_CHARACTER_SET:
set_charset(q); set_charset(q);
break; break;
case Q_DISABLE_PS_PROTOCOL: case Q_DISABLE_PS_PROTOCOL:
@ -3958,22 +3962,31 @@ int main(int argc, char **argv)
ps_protocol_enabled= ps_protocol; ps_protocol_enabled= ps_protocol;
break; break;
case Q_DISABLE_RECONNECT: case Q_DISABLE_RECONNECT:
cur_con->mysql.reconnect= 0; {
my_bool reconnect= 0;
mysql_options(&cur_con->mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
break; break;
}
case Q_ENABLE_RECONNECT: case Q_ENABLE_RECONNECT:
cur_con->mysql.reconnect= 1; {
my_bool reconnect= 1;
mysql_options(&cur_con->mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
break; break;
}
case Q_EXIT: case Q_EXIT:
abort_flag= 1; abort_flag= 1;
break; break;
default: processed = 0; break;
default:
processed= 0;
break;
} }
} }
if (!processed) if (!processed)
{ {
current_line_inc = 0; current_line_inc= 0;
switch (q->type) { switch (q->type) {
case Q_WHILE: do_block(cmd_while, q); break; case Q_WHILE: do_block(cmd_while, q); break;
case Q_IF: do_block(cmd_if, q); break; case Q_IF: do_block(cmd_if, q); break;

2
include/mysql.h
View File

@ -146,7 +146,7 @@ enum mysql_option
MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT, MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT,
MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION, MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT
}; };
struct st_mysql_options { struct st_mysql_options {

3
sql-common/client.c
View File

@ -2750,6 +2750,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
case MYSQL_REPORT_DATA_TRUNCATION: case MYSQL_REPORT_DATA_TRUNCATION:
mysql->options.report_data_truncation= test(*(my_bool *) arg); mysql->options.report_data_truncation= test(*(my_bool *) arg);
break; break;
case MYSQL_OPT_RECONNECT:
mysql->reconnect= *(my_bool *) arg;
break;
default: default:
DBUG_RETURN(1); DBUG_RETURN(1);
} }