summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authorhartmut@mysql.com <>2005-09-08 00:57:02 +0200
committerhartmut@mysql.com <>2005-09-08 00:57:02 +0200
commit052e9262ee2050976354213b30a596ce2b087d45 (patch)
treec735ad3fe4d11cf4556203e7edefbb2cc9346f40 /client/mysqlimport.c
parent9c51a97e90107e1ce69844c48062fb85a6b26bb7 (diff)
parent1e1872464b68a27f8255ad8600ccda79e93cd321 (diff)
downloadmariadb-git-052e9262ee2050976354213b30a596ce2b087d45.tar.gz
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 43b0672e03e..ca0a751e963 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -37,8 +37,9 @@ static char *add_load_option(char *ptr,const char *object,
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,