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-08-11 17:07:27-06:00, sasha@stripped
  temp commit working on a merge

  client/mysqlbinlog.cc
    1.44 01/08/11 17:07:26 sasha@stripped +0 -2
    remove unused variables

  sql/log_event.h
    1.53 01/08/11 17:07:26 sasha@stripped +2 -1
    fix bad merge

# 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.52/sql/log_event.h	Thu Aug  9 19:16:13 2001
+++ 1.53/sql/log_event.h	Sat Aug 11 17:07:26 2001
@@ -233,7 +233,8 @@
   virtual void print(FILE* file, bool short_form = 0, char* last_db = 0) = 0;
   void print_timestamp(FILE* file, time_t *ts = 0);
   void print_header(FILE* file);
-
+#endif
+  
 #ifndef MYSQL_CLIENT  
   // if mutex is 0, the read will proceed without mutex
   static Log_event* read_log_event(IO_CACHE* file, pthread_mutex_t* log_lock);

--- 1.43/client/mysqlbinlog.cc	Thu Aug  9 18:16:42 2001
+++ 1.44/client/mysqlbinlog.cc	Sat Aug 11 17:07:26 2001
@@ -41,8 +41,6 @@
 // needed by net_serv.c
 ulong bytes_sent = 0L, bytes_received = 0L;
 ulong mysqld_net_retry_count = 10L;
-ulong net_read_timeout=  NET_READ_TIMEOUT;
-ulong net_write_timeout= NET_WRITE_TIMEOUT;
 uint test_flags = 0; 
 FILE *result_file;