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, 2002-06-05 18:32:02-06:00, sasha@stripped
  post-merge fixes

  sql/mysqld.cc
    1.315 02/06/05 18:32:01 sasha@stripped +0 -2
    post-merge fix

  sql/sql_repl.cc
    1.79 02/06/05 18:32:01 sasha@stripped +0 -2
    post-merge fix

# 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:	/reiser-data/mysql-multi-master

--- 1.314/sql/mysqld.cc	Mon Jun  3 20:49:35 2002
+++ 1.315/sql/mysqld.cc	Wed Jun  5 18:32:01 2002
@@ -3053,7 +3053,6 @@
   */
   {"memlock", OPT_MEMLOCK, "Lock mysqld in memory", (gptr*) &locked_in_memory,
    (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF  
   {"disconnect-slave-event-count", OPT_DISCONNECT_SLAVE_EVENT_COUNT,
    "Undocumented: Meant for debugging and testing of replication",
    (gptr*) &disconnect_slave_event_count,
@@ -3073,7 +3072,6 @@
   {"safemalloc-mem-limit", OPT_SAFEMALLOC_MEM_LIMIT,
    "Simulate memory shortage when compiled with the --with-debug=full option",
    0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif  
   {"new", 'n', "Use very new possible 'unsafe' functions", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef NOT_YET

--- 1.78/sql/sql_repl.cc	Mon Jun  3 15:18:24 2002
+++ 1.79/sql/sql_repl.cc	Wed Jun  5 18:32:01 2002
@@ -27,11 +27,9 @@
 
 extern const char* any_db;
 
-#ifndef DBUG_OFF
 int max_binlog_dump_events = 0; // unlimited
 bool opt_sporadic_binlog_dump_fail = 0;
 static int binlog_dump_count = 0;
-#endif
 static int cmp_master_info(MASTER_INFO* mi, LEX_MASTER_INFO* lex_mi);
 
 static int cmp_master_info(MASTER_INFO* mi, LEX_MASTER_INFO* lex_mi)