After merge fix
sql/log_event.cc: Fixed a wrong && test -> &
This commit is contained in:
parent
41ce5aaa50
commit
dba3a0b031
@ -1861,8 +1861,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
|
|||||||
enum enum_duplicates handle_dup = DUP_IGNORE;
|
enum enum_duplicates handle_dup = DUP_IGNORE;
|
||||||
if (sql_ex.opt_flags & REPLACE_FLAG)
|
if (sql_ex.opt_flags & REPLACE_FLAG)
|
||||||
handle_dup= DUP_REPLACE;
|
handle_dup= DUP_REPLACE;
|
||||||
sql_exchange ex((char*)fname, sql_ex.opt_flags &&
|
sql_exchange ex((char*)fname, sql_ex.opt_flags & DUMPFILE_FLAG);
|
||||||
DUMPFILE_FLAG );
|
|
||||||
String field_term(sql_ex.field_term,sql_ex.field_term_len);
|
String field_term(sql_ex.field_term,sql_ex.field_term_len);
|
||||||
String enclosed(sql_ex.enclosed,sql_ex.enclosed_len);
|
String enclosed(sql_ex.enclosed,sql_ex.enclosed_len);
|
||||||
String line_term(sql_ex.line_term,sql_ex.line_term_len);
|
String line_term(sql_ex.line_term,sql_ex.line_term_len);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user