summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-12-01 15:21:42 +0100
committerunknown <guilhem@mysql.com>2003-12-01 15:21:42 +0100
commitf0bc11177de9160ecfc0086ec9373537f7b47830 (patch)
tree1f6fa1185add255e131a94f7e56d1b00ac15d1ca /sql
parent13f525c080c787af562aa1dd7b60d74889e41378 (diff)
parent8764ca94c958e5556b4fd0125ea1cf41f8b7af6c (diff)
downloadmariadb-git-f0bc11177de9160ecfc0086ec9373537f7b47830.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/log.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 33ca82aa14f..e6eaa3b802c 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1110,8 +1110,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;
}
@@ -1119,8 +1117,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;
}