Merge polly.local:/tmp/maint/bug23814/my51-bug23814
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
This commit is contained in:
commit
d65ae804cd
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user