Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
1385ffee · sasha@mysql.sashanet.com · b3392db2 · b64d6c9a · 1385ffee
Commit 1385ffee authored Jan 22, 2001 by sasha@mysql.sashanet.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/log_event.h sql/log_event.h +1 -1

No files found.
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -84,7 +84,7 @@ class Log_event
    when(when_arg), exec_time(exec_time_arg),
    valid_exec_time(valid_exec_time_arg)
  {
-    server_id = server_id_arg ? server_id_arg : server_id = ::server_id;
+    server_id = server_id_arg ? server_id_arg : (::server_id);
  }

  Log_event(const char* buf): valid_exec_time(0)