Commit 9f1da8ad authored by unknown's avatar unknown
Browse files

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23 

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
parents 3e52a3f1 bddd75d2

sql/log_event.cc

+5 −1
Original line number Diff line number Diff line
@@ -697,15 +697,19 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db) 
    pretty_print_char(file, sql_ex.escaped);

  }

     

  bool line_lexem_added= false;

  if(!(sql_ex.empty_flags & LINE_TERM_EMPTY))

  {

    fprintf(file," LINES TERMINATED BY ");

    pretty_print_char(file, sql_ex.line_term);

    line_lexem_added= true;

  }



  if(!(sql_ex.empty_flags & LINE_START_EMPTY))

  {

    fprintf(file," LINES STARTING BY ");

    if (!line_lexem_added)

      fprintf(file," LINES");

    fprintf(file," STARTING BY ");

    pretty_print_char(file, sql_ex.line_start);

  }