diff options
| -rw-r--r-- | client/mysqlbinlog.cc | 2 | ||||
| -rw-r--r-- | sql/log_event.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index a89b41fdfd3..35d6a7f3c4f 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -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; diff --git a/sql/log_event.h b/sql/log_event.h index 4c24f640465..af6619376b4 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -233,7 +233,8 @@ public: 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); |