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-06-29 09:55:21-06:00, sasha@stripped
  post-merge fix
  fixed bug in LOAD DATA FROM MASTER

  BitKeeper/etc/ignore
    1.73 01/06/29 09:55:20 sasha@stripped +1 -0
    Added scripts/mysqld_safe to the ignore list

  sql/mysqld.cc
    1.186 01/06/29 09:55:20 sasha@stripped +1 -1
    post-merge fix

  sql/sql_repl.cc
    1.47 01/06/29 09:55:20 sasha@stripped +5 -0
    post-merge fix
    fixed bug in LOAD DATA FROM MASTER

# 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.185/sql/mysqld.cc	Thu Jun 28 19:48:49 2001
+++ 1.186/sql/mysqld.cc	Fri Jun 29 09:55:20 2001
@@ -2487,7 +2487,7 @@
                OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC,
 	       OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINK, OPT_REPORT_HOST,
 	       OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,
-               OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP,
+               OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
                OPT_SHOW_SLAVE_AUTH_INFO};
 
 static struct option long_options[] = {

--- 1.72/BitKeeper/etc/ignore	Thu Jun 28 01:05:04 2001
+++ 1.73/BitKeeper/etc/ignore	Fri Jun 29 09:55:20 2001
@@ -370,3 +370,4 @@
 sql/share/mysql
 .gdbinit
 .vimrc
+scripts/mysqld_safe

--- 1.46/sql/sql_repl.cc	Thu Jun 28 19:48:49 2001
+++ 1.47/sql/sql_repl.cc	Fri Jun 29 09:55:20 2001
@@ -37,6 +37,10 @@
 bool opt_sporadic_binlog_dump_fail = 0;
 static int binlog_dump_count = 0;
 #endif
+
+static uint32* slave_list_key(SLAVE_INFO* si, uint* len,
+			     my_bool not_used __attribute__((unused)))
+{
   *len = 4;
   return &si->server_id;
 }
@@ -1143,6 +1147,7 @@
       table.next = 0;
       table.db = (char*)db;
       table.real_name = (char*)table_name;
+      table.updating = 1;
       if(!tables_ok(thd, &table))
 	continue;
     }