diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:07:27 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:07:27 -0600 |
| commit | 7a4b7c4fdac6143bf75344419eee740a8b5c9fd4 (patch) | |
| tree | dc987a8c3bc0bbc881783e3f6521fba1c34e8a52 /sql/log_event.h | |
| parent | 8af8098de065b3a6a51dc01a2a57c43815493a25 (diff) | |
| download | mariadb-git-7a4b7c4fdac6143bf75344419eee740a8b5c9fd4.tar.gz | |
temp commit working on a merge
client/mysqlbinlog.cc:
remove unused variables
sql/log_event.h:
fix bad merge
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |