Attachment #114881 for bug #157408

View | Details | Raw Unified | Return to bug 157408
Collapse All | Expand All




  DBUG_PRINT("enter",("option: %d",(int) option));
  switch (option) {
  case MYSQL_OPT_CONNECT_TIMEOUT:
    mysql->options.connect_timeout= *arg;
    break;
  case MYSQL_OPT_READ_TIMEOUT:
    mysql->options.read_timeout= *arg;
    break;
  case MYSQL_OPT_WRITE_TIMEOUT:
    mysql->options.write_timeout= *arg;
    break;
  case MYSQL_OPT_COMPRESS:
    mysql->options.compress= 1;			/* Remember for connect */

    mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
    break;
  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_LOCAL_FILES;
    else
      mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;

    mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
    break;
  case MYSQL_OPT_PROTOCOL:
    mysql->options.protocol= *arg;
    break;
  case MYSQL_SHARED_MEMORY_BASE_NAME:
#ifdef HAVE_SMEM

    mysql->reconnect= *(my_bool *) arg;
    break;
  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
    else
      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;




  DBUG_PRINT("enter",("option: %d",(int) option));
  switch (option) {
  case MYSQL_OPT_CONNECT_TIMEOUT:
    mysql->options.connect_timeout= *arg;
    break;
  case MYSQL_OPT_READ_TIMEOUT:
    mysql->options.read_timeout= *arg;
    break;
  case MYSQL_OPT_WRITE_TIMEOUT:
    mysql->options.write_timeout= *arg;
    break;
  case MYSQL_OPT_COMPRESS:
    mysql->options.compress= 1;			/* Remember for connect */

    mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
    break;
  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_LOCAL_FILES;
    else
      mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;

    mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
    break;
  case MYSQL_OPT_PROTOCOL:
    mysql->options.protocol= *arg;
    break;
  case MYSQL_SHARED_MEMORY_BASE_NAME:
#ifdef HAVE_SMEM

    mysql->reconnect= *(my_bool *) arg;
    break;
  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
    else
      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;




  DBUG_PRINT("enter",("option: %d",(int) option));
  switch (option) {
  case MYSQL_OPT_CONNECT_TIMEOUT:
    mysql->options.connect_timeout= *arg;
    break;
  case MYSQL_OPT_READ_TIMEOUT:
    mysql->options.read_timeout= *arg;
    break;
  case MYSQL_OPT_WRITE_TIMEOUT:
    mysql->options.write_timeout= *arg;
    break;
  case MYSQL_OPT_COMPRESS:
    mysql->options.compress= 1;			/* Remember for connect */

    mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
    break;
  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_LOCAL_FILES;
    else
      mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;

    mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
    break;
  case MYSQL_OPT_PROTOCOL:
    mysql->options.protocol= *arg;
    break;
  case MYSQL_SHARED_MEMORY_BASE_NAME:
#ifdef HAVE_SMEM

    mysql->reconnect= *(my_bool *) arg;
    break;
  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
    if (!arg || test(*arg))
      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
    else
      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;

Return to bug 157408

Lines 2948-2960 Link Here

(-)libmysqld/client.c.orig (-6 / +6 lines)
2948	DBUG_PRINT("enter",("option: %d",(int) option));	2948	DBUG_PRINT("enter",("option: %d",(int) option));
2949	switch (option) {	2949	switch (option) {
2950	case MYSQL_OPT_CONNECT_TIMEOUT:	2950	case MYSQL_OPT_CONNECT_TIMEOUT:
2951	mysql->options.connect_timeout= (uint) arg;	2951	mysql->options.connect_timeout= *arg;
2952	break;	2952	break;
2953	case MYSQL_OPT_READ_TIMEOUT:	2953	case MYSQL_OPT_READ_TIMEOUT:
2954	mysql->options.read_timeout= (uint) arg;	2954	mysql->options.read_timeout= *arg;
2955	break;	2955	break;
2956	case MYSQL_OPT_WRITE_TIMEOUT:	2956	case MYSQL_OPT_WRITE_TIMEOUT:
2957	mysql->options.write_timeout= (uint) arg;	2957	mysql->options.write_timeout= *arg;
2958	break;	2958	break;
2959	case MYSQL_OPT_COMPRESS:	2959	case MYSQL_OPT_COMPRESS:
2960	mysql->options.compress= 1; /* Remember for connect */	2960	mysql->options.compress= 1; /* Remember for connect */
Lines 2964-2970 Link Here
2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */	2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
2965	break;	2965	break;
2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/	2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
2967	if (!arg \|\| test((uint) arg))	2967	if (!arg \|\| test(*arg))
2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;	2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;
2969	else	2969	else
2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;	2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
Lines 2989-2995 Link Here
2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));	2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
2990	break;	2990	break;
2991	case MYSQL_OPT_PROTOCOL:	2991	case MYSQL_OPT_PROTOCOL:
2992	mysql->options.protocol= (uint) arg;	2992	mysql->options.protocol= *arg;
2993	break;	2993	break;
2994	case MYSQL_SHARED_MEMORY_BASE_NAME:	2994	case MYSQL_SHARED_MEMORY_BASE_NAME:
2995	#ifdef HAVE_SMEM	2995	#ifdef HAVE_SMEM
Lines 3016-3022 Link Here
3016	mysql->reconnect= (my_bool ) arg;	3016	mysql->reconnect= (my_bool ) arg;
3017	break;	3017	break;
3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:	3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
3019	if (!arg \|\| test((uint) arg))	3019	if (!arg \|\| test(*arg))
3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;	3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;
3021	else	3021	else
3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;	3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;

Lines 2948-2960 Link Here

(-)sql/client.c.orig (-6 / +6 lines)
2948	DBUG_PRINT("enter",("option: %d",(int) option));	2948	DBUG_PRINT("enter",("option: %d",(int) option));
2949	switch (option) {	2949	switch (option) {
2950	case MYSQL_OPT_CONNECT_TIMEOUT:	2950	case MYSQL_OPT_CONNECT_TIMEOUT:
2951	mysql->options.connect_timeout= (uint) arg;	2951	mysql->options.connect_timeout= *arg;
2952	break;	2952	break;
2953	case MYSQL_OPT_READ_TIMEOUT:	2953	case MYSQL_OPT_READ_TIMEOUT:
2954	mysql->options.read_timeout= (uint) arg;	2954	mysql->options.read_timeout= *arg;
2955	break;	2955	break;
2956	case MYSQL_OPT_WRITE_TIMEOUT:	2956	case MYSQL_OPT_WRITE_TIMEOUT:
2957	mysql->options.write_timeout= (uint) arg;	2957	mysql->options.write_timeout= *arg;
2958	break;	2958	break;
2959	case MYSQL_OPT_COMPRESS:	2959	case MYSQL_OPT_COMPRESS:
2960	mysql->options.compress= 1; /* Remember for connect */	2960	mysql->options.compress= 1; /* Remember for connect */
Lines 2964-2970 Link Here
2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */	2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
2965	break;	2965	break;
2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/	2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
2967	if (!arg \|\| test((uint) arg))	2967	if (!arg \|\| test(*arg))
2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;	2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;
2969	else	2969	else
2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;	2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
Lines 2989-2995 Link Here
2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));	2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
2990	break;	2990	break;
2991	case MYSQL_OPT_PROTOCOL:	2991	case MYSQL_OPT_PROTOCOL:
2992	mysql->options.protocol= (uint) arg;	2992	mysql->options.protocol= *arg;
2993	break;	2993	break;
2994	case MYSQL_SHARED_MEMORY_BASE_NAME:	2994	case MYSQL_SHARED_MEMORY_BASE_NAME:
2995	#ifdef HAVE_SMEM	2995	#ifdef HAVE_SMEM
Lines 3016-3022 Link Here
3016	mysql->reconnect= (my_bool ) arg;	3016	mysql->reconnect= (my_bool ) arg;
3017	break;	3017	break;
3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:	3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
3019	if (!arg \|\| test((uint) arg))	3019	if (!arg \|\| test(*arg))
3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;	3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;
3021	else	3021	else
3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;	3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;

Lines 2948-2960 Link Here

(-)sql-common/client.c.orig (-6 / +6 lines)
2948	DBUG_PRINT("enter",("option: %d",(int) option));	2948	DBUG_PRINT("enter",("option: %d",(int) option));
2949	switch (option) {	2949	switch (option) {
2950	case MYSQL_OPT_CONNECT_TIMEOUT:	2950	case MYSQL_OPT_CONNECT_TIMEOUT:
2951	mysql->options.connect_timeout= (uint) arg;	2951	mysql->options.connect_timeout= *arg;
2952	break;	2952	break;
2953	case MYSQL_OPT_READ_TIMEOUT:	2953	case MYSQL_OPT_READ_TIMEOUT:
2954	mysql->options.read_timeout= (uint) arg;	2954	mysql->options.read_timeout= *arg;
2955	break;	2955	break;
2956	case MYSQL_OPT_WRITE_TIMEOUT:	2956	case MYSQL_OPT_WRITE_TIMEOUT:
2957	mysql->options.write_timeout= (uint) arg;	2957	mysql->options.write_timeout= *arg;
2958	break;	2958	break;
2959	case MYSQL_OPT_COMPRESS:	2959	case MYSQL_OPT_COMPRESS:
2960	mysql->options.compress= 1; /* Remember for connect */	2960	mysql->options.compress= 1; /* Remember for connect */
Lines 2964-2970 Link Here
2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */	2964	mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
2965	break;	2965	break;
2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/	2966	case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
2967	if (!arg \|\| test((uint) arg))	2967	if (!arg \|\| test(*arg))
2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;	2968	mysql->options.client_flag\|= CLIENT_LOCAL_FILES;
2969	else	2969	else
2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;	2970	mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
Lines 2989-2995 Link Here
2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));	2989	mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
2990	break;	2990	break;
2991	case MYSQL_OPT_PROTOCOL:	2991	case MYSQL_OPT_PROTOCOL:
2992	mysql->options.protocol= (uint) arg;	2992	mysql->options.protocol= *arg;
2993	break;	2993	break;
2994	case MYSQL_SHARED_MEMORY_BASE_NAME:	2994	case MYSQL_SHARED_MEMORY_BASE_NAME:
2995	#ifdef HAVE_SMEM	2995	#ifdef HAVE_SMEM
Lines 3016-3022 Link Here
3016	mysql->reconnect= (my_bool ) arg;	3016	mysql->reconnect= (my_bool ) arg;
3017	break;	3017	break;
3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:	3018	case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
3019	if (!arg \|\| test((uint) arg))	3019	if (!arg \|\| test(*arg))
3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;	3020	mysql->options.client_flag\|= CLIENT_SSL_VERIFY_SERVER_CERT;
3021	else	3021	else
3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;	3022	mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;