List:Internals« Previous MessageNext Message »
From:sinisa Date:March 9 2004 3:00pm
Subject:bk commit into 4.0 tree (Sinisa:1.1731)
View as plain text  
Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1731 04/03/09 17:00:00 Sinisa@stripped +1 -0
  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
    1.105 04/03/09 16:58:20 Sinisa@stripped +10 -7
    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.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.104/client/mysqldump.c	Wed Feb  4 17:50:30 2004
+++ 1.105/client/mysqldump.c	Tue Mar  9 16:58:20 2004
@@ -72,13 +72,13 @@
 
 static char *field_escape(char *to,const char *from,uint length);
 static my_bool  verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0,
-		lock_tables=0,ignore_errors=0,flush_logs=0,replace=0,
-		ignore=0,opt_drop=0,opt_keywords=0,opt_lock=0,opt_compress=0,
-                opt_delayed=0,create_options=0,opt_quoted=0,opt_databases=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;
+  lock_tables=0,ignore_errors=0,flush_logs=0,replace=0,
+  ignore=0,opt_drop=0,opt_keywords=0,opt_lock=0,opt_compress=0,
+  opt_delayed=0,create_options=0,opt_quoted=0,opt_databases=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_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 @@
   {"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,
Thread
bk commit into 4.0 tree (Sinisa:1.1731)sinisa9 Mar