databases/mysql56-client/patches/patch-sql-common_client.c

   1 $NetBSD$
   2
   3 --- sql-common/client.c.orig    2013-04-28 13:57:28.000000000 +0000
   4 +++ sql-common/client.c
   5 @@ -1289,7 +1289,7 @@ void mysql_read_default_options(struct s
   6            options->secure_auth= TRUE;
   7            break;
   8          case OPT_report_data_truncation:
   9 -          options->report_data_truncation= opt_arg ? test(atoi(opt_arg)) : 1;
  10 +          options->report_data_truncation= opt_arg ? my_test(atoi(opt_arg)) : 1;
  11            break;
  12          case OPT_plugin_dir:
  13            {
  14 @@ -4296,7 +4296,7 @@ mysql_options(MYSQL *mysql,enum mysql_op
  15      mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
  16      break;
  17    case MYSQL_OPT_LOCAL_INFILE:                 /* Allow LOAD DATA LOCAL ?*/
  18 -    if (!arg || test(*(uint*) arg))
  19 +    if (!arg || my_test(*(uint*) arg))
  20        mysql->options.client_flag|= CLIENT_LOCAL_FILES;
  21      else
  22        mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
  23 @@ -4342,7 +4342,7 @@ mysql_options(MYSQL *mysql,enum mysql_op
  24      mysql->options.secure_auth= *(my_bool *) arg;
  25      break;
  26    case MYSQL_REPORT_DATA_TRUNCATION:
  27 -    mysql->options.report_data_truncation= test(*(my_bool *) arg);
  28 +    mysql->options.report_data_truncation= my_test(*(my_bool *) arg);
  29      break;
  30    case MYSQL_OPT_RECONNECT:
  31      mysql->reconnect= *(my_bool *) arg;