Commit fb44f7ce authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix for LOAD DATA LOCAL INFILE patch

parent f13a4518

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -2294,9 +2294,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) 
    break;

  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/

    if (!arg || test(*(uint*) arg))

      mysql->client_flag|= CLIENT_LOCAL_FILES;

      mysql->options.client_flag|= CLIENT_LOCAL_FILES;

    else

      mysql->client_flag&= ~CLIENT_LOCAL_FILES;

      mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;

    break;

  case MYSQL_INIT_COMMAND:

    my_free(mysql->options.init_command,MYF(MY_ALLOW_ZERO_PTR));

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ ulong bytes_sent = 0L, bytes_received = 0L; 


bool opt_endinfo,using_udf_functions,low_priority_updates, locked_in_memory;

bool opt_using_transactions, using_update_log, opt_warnings=0;

bool opt_local_infile;

bool opt_local_infile=1;

bool volatile abort_loop,select_thread_in_use,grant_option;

bool volatile ready_to_exit,shutdown_in_progress;

ulong refresh_version=1L,flush_version=1L;	/* Increments on each reload */
@@ -3472,7 +3472,7 @@ static void get_options(int argc,char **argv) 
      mysql_port= (unsigned int) atoi(optarg);

      break;

    case OPT_LOCAL_INFILE:

      opt_local_infile= test(optarg || atoi(optarg) != 0);

      opt_local_infile= test(!optarg || atoi(optarg) != 0);

      break;

    case OPT_SLAVE_SKIP_ERRORS:

      init_slave_skip_errors(optarg);