mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/jimw/my/mysql-5.0-11787

Browse source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com 2005-09-03 09:34:34 -07:00
commit 3be42aabc5
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
client/mysqltest.c
View file

@ -1974,14 +1974,15 @@ int safe_connect(MYSQL* con, const char *host, const char *user,
const char *pass,
const char *db, int port, const char *sock)
{
int con_error = 1;
int con_error= 1;
my_bool reconnect= 1;
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,
CLIENT_MULTI_STATEMENTS | CLIENT_REMEMBER_OPTIONS))
{
con_error = 0;
con_error= 0;
break;
}
sleep(CON_RETRY_SLEEP);
@ -1990,7 +1991,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
existing behavior
*/
con->reconnect= 1;
mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);
return con_error;
}
@ -2024,6 +2025,7 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
int* create_conn)
{
DYNAMIC_STRING ds_tmp, *ds;
my_bool reconnect= 1;
int error= 0;
/*
@ -2089,7 +2091,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
existing behavior
*/
con->reconnect= 1;
mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);
if (record)
{
@ -2368,6 +2370,7 @@ int read_line(char *buf, int size)
enum {R_NORMAL, R_Q, R_Q_IN_Q, R_SLASH_IN_Q,
R_COMMENT, R_LINE_START} state= R_LINE_START;
DBUG_ENTER("read_line");
LINT_INIT(quote);
start_lineno= *lineno;
for (; p < buf_end ;)
@ -4264,11 +4267,17 @@ int main(int argc, char **argv)
ps_protocol_enabled= ps_protocol;
break;
case Q_DISABLE_RECONNECT:
cur_con->mysql.reconnect= 0;
{
my_bool reconnect= 0;
mysql_options(&cur_con->mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
break;
}
case Q_ENABLE_RECONNECT:
cur_con->mysql.reconnect= 1;
{
my_bool reconnect= 1;
mysql_options(&cur_con->mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
break;
}
case Q_DISABLE_PARSING:
parsing_disabled++;
break;
@ -4284,13 +4293,16 @@ int main(int argc, char **argv)
case Q_EXIT:
abort_flag= 1;
break;
default: processed = 0; break;
default:
processed= 0;
break;
}
}
if (!processed)
{
current_line_inc = 0;
current_line_inc= 0;
switch (q->type) {
case Q_WHILE: do_block(cmd_while, 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_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
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 {

3
sql-common/client.c
View file

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