Merge work:/home/bk/mysql

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


sql/log_event.h:
  Auto merged

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)