Commit 32ba57b8 authored by unknown's avatar unknown
Browse files

mysqldump.c: 

  This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.


client/mysqldump.c:
  This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.
parent c0422729

client/mysqldump.c

+10 −7
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0, 
  opt_alldbs=0,opt_create_db=0,opt_first_slave=0,

  opt_autocommit=0,opt_master_data,opt_disable_keys=0,opt_xml=0,

  opt_delete_master_logs=0, tty_password=0,

		opt_single_transaction=0, opt_comments= 0;

  opt_single_transaction=0, opt_comments= 0, opt_local_infile= 0;

static MYSQL  mysql_connection,*sock=0;

static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,

             *current_host=0,*path=0,*fields_terminated=0,
@@ -170,6 +170,9 @@ static struct my_option my_long_options[] = 
  {"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...",

   (gptr*) &lines_terminated, (gptr*) &lines_terminated, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.",

   (gptr*) &opt_local_infile,

   (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"lock-tables", 'l', "Lock all tables for read.", (gptr*) &lock_tables,

   (gptr*) &lock_tables, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"master-data", OPT_MASTER_DATA,