diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 19:55:37 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 19:55:37 +0300 |
| commit | 5f5b6a7cea8ad5f1594e0dc1f72e3e00855c892b (patch) | |
| tree | c9a11b51aa48ec7aafde041e18ad44ef0c527385 /sql/log_event.cc | |
| parent | 1834b6ff4955a0e7f19638a1abd5de5ab9eaed73 (diff) | |
| parent | 9c1c76bf2ee09bd4f1308e31a5b1b88f06f39431 (diff) | |
| download | mariadb-git-5f5b6a7cea8ad5f1594e0dc1f72e3e00855c892b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index f39ff643f21..9ed672d8d4e 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) @@ -1876,7 +1881,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, ex.skip_lines = skip_lines; List<Item> field_list; set_fields(field_list); - thd->slave_proxy_id = thd->thread_id; + thd->slave_proxy_id = thread_id; if (net) { // mysql_load will use thd->net to read the file |