Commit d725abf1 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

temp commit working on a merge

parent 1da341fc

client/mysqlbinlog.cc

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ uint32 server_id = 0; 
// 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;

sql/log_event.h

+2 −1
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ class Log_event 
  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