diff options
| author | unknown <hartmut@mysql.com> | 2005-09-08 00:57:02 +0200 |
|---|---|---|
| committer | unknown <hartmut@mysql.com> | 2005-09-08 00:57:02 +0200 |
| commit | 0c51dc75d9a9b6ae52a7df2bceee8c16fbb04a54 (patch) | |
| tree | c735ad3fe4d11cf4556203e7edefbb2cc9346f40 /client | |
| parent | cf0b4702f568ca76e78e1ac47e0e37e19f1b00f8 (diff) | |
| parent | d8bb755f2a9964bcac89408abfc4fb06bd3b8ceb (diff) | |
| download | mariadb-git-0c51dc75d9a9b6ae52a7df2bceee8c16fbb04a54.tar.gz | |
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
client/mysqlimport.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlimport.c | 3 |
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, |