diff options
| author | unknown <guilhem@mysql.com> | 2003-12-19 23:05:07 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-12-19 23:05:07 +0100 |
| commit | 5084b6b701ef5f2c2d1539a8775774c6c9bbf995 (patch) | |
| tree | 50edba9e847c863859ce7be00e6bbda0b26f939b /sql/log.cc | |
| parent | 62554f812e91ba251abb3e45dd1c3036cd96069a (diff) | |
| parent | b41e6294ca97aaeb403972feb19ecc6d177096ca (diff) | |
| download | mariadb-git-5084b6b701ef5f2c2d1539a8775774c6c9bbf995.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
include/my_sys.h:
Auto merged
mysql-test/r/rpl_max_relay_size.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/rpl_trunc_binlog.result:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_max_relay_size.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_trunc_binlog.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/log.cc b/sql/log.cc index 99af550286a..da20bfdb9fa 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1009,7 +1009,7 @@ void MYSQL_LOG::new_file(bool need_lock) We log the whole file name for log file as the user may decide to change base names at some point. */ - THD* thd = current_thd; + THD *thd = current_thd; /* may be 0 if we are reacting to SIGHUP */ Rotate_log_event r(thd,new_name+dirname_length(new_name)); r.set_log_pos(this); r.write(&log_file); @@ -1285,8 +1285,6 @@ bool MYSQL_LOG::write(Log_event* event_info) Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT, thd->current_insert_id); e.set_log_pos(this); - if (thd->server_id) - e.server_id = thd->server_id; if (e.write(file)) goto err; } @@ -1294,8 +1292,6 @@ bool MYSQL_LOG::write(Log_event* event_info) { Intvar_log_event e(thd,(uchar) INSERT_ID_EVENT,thd->last_insert_id); e.set_log_pos(this); - if (thd->server_id) - e.server_id = thd->server_id; if (e.write(file)) goto err; } |