From: Date: September 2 2005 10:52pm
Subject: bk commit into 4.0 tree (hartmut:1.2145) BUG#12958
List-Archive: http://lists.mysql.com/internals/29257
X-Bug: 12958
Message-Id: <20050902205257.3926B19D001@linux.site>

Below is the list of changes that have just been committed into a local
4.0 repository of hartmut. When hartmut 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2145 05/09/02 22:52:52 hartmut@stripped +1 -0
  fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 

  client/mysqlimport.c
    1.37 05/09/02 22:52:48 hartmut@stripped +2 -1
    fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/4.0

--- 1.36/client/mysqlimport.c	2005-08-24 21:03:11 +02:00
+++ 1.37/client/mysqlimport.c	2005-09-02 22:52:48 +02:00
@@ -37,8 +37,9 @@
 			     const char *statement);
 
 static my_bool	verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,
-		replace=0,silent=0,ignore=0,opt_compress=0,opt_local_file=0,
+		replace=0,silent=0,ignore=0,opt_compress=0,
                 opt_low_priority= 0, tty_password= 0;
+static uint     opt_local_file=0;
 static MYSQL	mysql_connection;
 static char	*opt_password=0, *current_user=0,
 		*current_host=0, *current_db=0, *fields_terminated=0,