diff options
| author | sasha@mysql.sashanet.com <> | 2001-08-09 19:21:59 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-08-09 19:21:59 -0600 |
| commit | 1da341fc5a58933a6115ef152eae9dcb8e00ffcd (patch) | |
| tree | 6f23729fdf91d088ef7eff5ea375f1f1f9d99879 /sql/log_event.h | |
| parent | 24bcdaaff382a154a647dc5c3cf1fc4ee1bbbcd7 (diff) | |
| parent | f6836bf81abb42523349ac6cf0b8807fa9e69c3e (diff) | |
| download | mariadb-git-1da341fc5a58933a6115ef152eae9dcb8e00ffcd.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index d16d76bed37..4c24f640465 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -233,10 +233,13 @@ 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); +#else // avoid having to link mysqlbinlog against libpthread + static Log_event* read_log_event(IO_CACHE* file); +#endif static Log_event* read_log_event(const char* buf, int event_len); const char* get_type_str(); |