1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After merge fix

Browse Source 
sql/log_event.cc:
  Fixed a wrong && test -> &
This commit is contained in:
unknown 2003-04-03 21:19:11 +03:00
parent 41ce5aaa50
commit dba3a0b031
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/log_event.cc
View File

@ -1146,9 +1146,9 @@ Load_log_event::Load_log_event(THD* thd_arg, sql_exchange* ex,
sql_ex.cached_new_format = -1; sql_ex.cached_new_format = -1;
if (ex->dumpfile) if (ex->dumpfile)
sql_ex.opt_flags |= DUMPFILE_FLAG; sql_ex.opt_flags|= DUMPFILE_FLAG;
if (ex->opt_enclosed) if (ex->opt_enclosed)
sql_ex.opt_flags |= OPT_ENCLOSED_FLAG; sql_ex.opt_flags|= OPT_ENCLOSED_FLAG;
sql_ex.empty_flags = 0; sql_ex.empty_flags = 0;
@ -1159,15 +1159,15 @@ Load_log_event::Load_log_event(THD* thd_arg, sql_exchange* ex,
} }
if (!ex->field_term->length()) if (!ex->field_term->length())
sql_ex.empty_flags |= FIELD_TERM_EMPTY; sql_ex.empty_flags|= FIELD_TERM_EMPTY;
if (!ex->enclosed->length()) if (!ex->enclosed->length())
sql_ex.empty_flags |= ENCLOSED_EMPTY; sql_ex.empty_flags|= ENCLOSED_EMPTY;
if (!ex->line_term->length()) if (!ex->line_term->length())
sql_ex.empty_flags |= LINE_TERM_EMPTY; sql_ex.empty_flags|= LINE_TERM_EMPTY;
if (!ex->line_start->length()) if (!ex->line_start->length())
sql_ex.empty_flags |= LINE_START_EMPTY; sql_ex.empty_flags|= LINE_START_EMPTY;
if (!ex->escaped->length()) if (!ex->escaped->length())
sql_ex.empty_flags |= ESCAPED_EMPTY; sql_ex.empty_flags|= ESCAPED_EMPTY;
skip_lines = ex->skip_lines; skip_lines = ex->skip_lines;
@ -1860,9 +1860,8 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
char llbuff[22]; char llbuff[22];
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);