diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-03-25 19:58:40 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-03-25 19:58:40 -0400 |
| commit | 592a398f7541c0a0d3c6f499693d00452d498c2f (patch) | |
| tree | eb467cb662a21228d6302225cfc727957dba2e10 | |
| parent | 4291001df9ebb77ed7763e0875b9a95c581c3261 (diff) | |
| parent | f4305a899ade995cde96cfe137cca30b668192a8 (diff) | |
| download | mariadb-git-592a398f7541c0a0d3c6f499693d00452d498c2f.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/log_event.cc:
Auto merged
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/log_event.cc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 71e7c58cda7..dbd4df6efe4 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -94,6 +94,7 @@ tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet venu@work.mysql.com +vva@eagle.mysql.r18.ru vva@genie.(none) walrus@kishkin.ru walrus@mysql.com diff --git a/sql/log_event.cc b/sql/log_event.cc index 78470a2b198..bb885ead3df 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1868,6 +1868,11 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, String line_term(sql_ex.line_term,sql_ex.line_term_len); String line_start(sql_ex.line_start,sql_ex.line_start_len); String escaped(sql_ex.escaped,sql_ex.escaped_len); + ex.field_term= &field_term; + ex.enclosed= &enclosed; + ex.line_term= &line_term; + ex.line_start= &line_start; + ex.escaped= &escaped; ex.opt_enclosed = (sql_ex.opt_flags & OPT_ENCLOSED_FLAG); if (sql_ex.empty_flags & FIELD_TERM_EMPTY) |