Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
f0bc1117 · unknown · 13f525c0 · 8764ca94 · f0bc1117
Commit f0bc1117 authored Dec 01, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

sql/log.cc sql/log.cc +0 -4

No files found.
--- 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;
      }