merged

BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_update.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

BitKeeper/etc/logging_ok

 Sinisa@sinisa.nasamreza.org
+davida@isil.mysql.com
 heikki@donna.mysql.fi
 jani@hynda.mysql.fi
 jani@janikt.pp.saunalahti.fi

myisam/ft_update.c

@@ -147,6 +147,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2)
       memcpy_fixed(&pos2,pos2+keyseg->bit_start,sizeof(char*));
       set_if_smaller(len2,keyseg->length);
     }
+    else /* fixed length key */
+    {
+      len1=len2=keyseg->length;
+    }
     if ((len1 != len2) || memcmp(pos1, pos2, len1))
       return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT;
   }

sql/log.cc

@@ -732,7 +732,7 @@ err:
     if (file == &log_file)
       VOID(pthread_cond_broadcast(&COND_binlog_update));
   }
-  if(should_rotate)
+  if (should_rotate)
     new_file(1); // inside mutex
   VOID(pthread_mutex_unlock(&LOCK_log));
   return error;
@@ -820,10 +820,13 @@ bool MYSQL_LOG::write(Load_log_event* event_info)
 	VOID(pthread_cond_broadcast(&COND_binlog_update));
       }
     }
+    
     if(should_rotate)
       new_file(1); // inside mutex
+    
     VOID(pthread_mutex_unlock(&LOCK_log));
   }
+
   return error;
 }
 

sql/mysqld.cc

@@ -1504,7 +1504,7 @@ static void open_log(MYSQL_LOG *log, const char *hostname,
     char* p = strrchr(opt_name, FN_EXTCHAR);
     if (p)
       *p = 0;
-  } 
+  }
   log->open(opt_name,type);
 }
 

sql/sql_class.h

@@ -80,7 +80,7 @@ public:
   void init(enum_log_type log_type_arg);
   void open(const char *log_name,enum_log_type log_type,
 	    const char *new_name=0);
-  void new_file(bool inside_mutex=0);
+  void new_file(bool inside_mutex = 0);
   bool open_index(int options);
   void close_index();
   bool write(THD *thd, enum enum_server_command command,const char *format,...);