bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-07-10 20:35:42-06:00, sasha@stripped
  mysql-test/t/rpl_sporadic_master.test
      use truncate table
  sql/slave.cc
      fixed race condition on server shutdown
  sql/sql_repl.cc
      fixed uninitialized use of io_cache

  mysql-test/t/rpl_sporadic_master.test
    1.3 01/07/10 20:35:41 sasha@stripped +2 -7
    use truncate table

  sql/slave.cc
    1.117 01/07/10 20:35:41 sasha@stripped +5 -0
    fixed race condition on server shutdown

  sql/sql_repl.cc
    1.51 01/07/10 20:35:41 sasha@stripped +1 -1
    fixed uninitialized use of io_cache

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.116/sql/slave.cc	Tue Jul 10 18:08:29 2001
+++ 1.117/sql/slave.cc	Tue Jul 10 20:35:41 2001
@@ -190,6 +190,11 @@
 
 void end_slave()
 {
+  pthread_mutex_lock(&LOCK_slave);
+  while (slave_running)
+    pthread_cond_wait(&COND_slave_stopped, &LOCK_slave);
+  pthread_mutex_unlock(&LOCK_slave);
+  
   end_master_info(&glob_mi);
   if(do_table_inited)
     hash_free(&replicate_do_table);

--- 1.2/mysql-test/t/rpl_sporadic_master.test	Tue Jul 10 18:08:29 2001
+++ 1.3/mysql-test/t/rpl_sporadic_master.test	Tue Jul 10 20:35:41 2001
@@ -5,18 +5,13 @@
 drop table if exists t1;
 create table t1(n int not null auto_increment primary key);
 insert into t1 values (NULL),(NULL);
-delete from t1;
-set insert_id=1;
+truncate table t1;
 insert into t1 values (NULL),(NULL);
-set insert_id=3;
 insert into t1 values (NULL),(NULL);
 flush logs;
-delete from t1;
-set insert_id=1;
+truncate table t1;
 insert into t1 values (NULL),(NULL);
-set insert_id=3;
 insert into t1 values (NULL),(NULL);
-set insert_id=5;
 insert into t1 values (NULL),(NULL);
 save_master_pos;
 connection slave;

--- 1.50/sql/sql_repl.cc	Tue Jul 10 18:08:29 2001
+++ 1.51/sql/sql_repl.cc	Tue Jul 10 20:35:41 2001
@@ -350,6 +350,7 @@
   int left_events = max_binlog_dump_events;
 #endif
   DBUG_ENTER("mysql_binlog_send");
+  bzero((char*) &log,sizeof(log));
 
 #ifndef DBUG_OFF
   if (opt_sporadic_binlog_dump_fail && (binlog_dump_count++ % 2))
@@ -359,7 +360,6 @@
   }
 #endif
 
-  bzero((char*) &log,sizeof(log));
 
   if (!mysql_bin_log.is_open())
   {