Commit 81303333 authored by unknown's avatar unknown
Browse files

Make it possible to change reconnect setting with 

mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)


client/mysqltest.c:
  Use mysql_options(..., MYSQL_OPT_RECONNECT, ...) to change reconnect
include/mysql.h:
  Add MYSQL_OPT_RECONNECT option
sql-common/client.c:
  Allow changing reconnect using MYSQL_OPT_RECONNECT.
parent 348dfd41

client/mysqltest.c

+25 −12
Original line number Diff line number Diff line
@@ -1732,6 +1732,7 @@ int safe_connect(MYSQL* con, const char* host, const char* user, 
		 const char* db, int port, const char* sock)

{

  int con_error= 1;

  my_bool reconnect= 1;

  int i;

  for (i= 0; i < MAX_CON_TRIES; ++i)

  {
@@ -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

   existing behavior

  */

  con->reconnect= 1;

  mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);

  return con_error;

}
@@ -1781,6 +1782,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;



  /*
@@ -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

   existing behavior

  */

  con->reconnect= 1;

  mysql_options(con, MYSQL_OPT_RECONNECT, (char *)&reconnect);



  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,

	R_COMMENT, R_LINE_START} state= R_LINE_START;

  DBUG_ENTER("read_line");

  LINT_INIT(quote);



  start_lineno= *lineno;

  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)

    {

      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */

      LINT_INIT(affected_rows);



      if (res)

      {
@@ -3958,16 +3962,25 @@ 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_EXIT:

        abort_flag= 1;

        break;

      default: processed = 0; break;



      default:

        processed= 0;

        break;

      }

    }

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

sql-common/client.c

+3 −0
Original line number Diff line number Diff line
@@ -2750,6 +2750,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);

  }