diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-05-21 15:18:30 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-05-21 15:18:30 -0400 |
| commit | 9f1da8ad492f3274492d81dcb39287ac034da65c (patch) | |
| tree | 8fb664c9a14a3878e41403848b3bd5113d27c80b /sql/log_event.cc | |
| parent | 3e52a3f1fc2b1c65e9f08b66f10056312ce363e1 (diff) | |
| parent | bddd75d28eba0c5dade8facd7484d0ad67f20176 (diff) | |
| download | mariadb-git-9f1da8ad492f3274492d81dcb39287ac034da65c.tar.gz | |
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
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index da25f842bd0..1c9c48e2d93 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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); } |