diff options
author | unknown <kaa@polly.local> | 2007-01-19 14:29:18 +0300 |
---|---|---|
committer | unknown <kaa@polly.local> | 2007-01-19 14:29:18 +0300 |
commit | d65ae804cdd74daa6b18618dd81bfee92502597b (patch) | |
tree | 1597ea93fc0584f747ce80e5a098c6d7ae117357 /client | |
parent | 82d169b06c11ab7717abe5f4df24f8cd28afe899 (diff) | |
parent | c9dce3b61a51d9b30adb2f944231f4303495b7b8 (diff) | |
download | mariadb-git-d65ae804cdd74daa6b18618dd81bfee92502597b.tar.gz |
Merge polly.local:/tmp/maint/bug23814/my51-bug23814
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlimport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 2d0c0188cb0..c9e21de1b2a 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -49,8 +49,8 @@ static char *add_load_option(char *ptr,const char *object, static my_bool verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0, replace=0,silent=0,ignore=0,opt_compress=0, opt_low_priority= 0, tty_password= 0; -static my_bool opt_use_threads= 0, info_flag= 0; -static uint opt_local_file=0; +static my_bool info_flag= 0; +static uint opt_use_threads=0, opt_local_file=0; static char *opt_password=0, *current_user=0, *current_host=0, *current_db=0, *fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, |