diff options
| author | sasha@mysql.sashanet.com <> | 2001-08-09 19:16:15 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-08-09 19:16:15 -0600 |
| commit | f6836bf81abb42523349ac6cf0b8807fa9e69c3e (patch) | |
| tree | ed06f905f1515a2117cc0c243c526264fccaac77 /sql/log_event.h | |
| parent | d9737f20f838f189ef1f3d25df7739770f3b52b9 (diff) | |
| parent | be4f7bbdcf89e5fa2a9e8193cda1d317918d7d07 (diff) | |
| download | mariadb-git-f6836bf81abb42523349ac6cf0b8807fa9e69c3e.tar.gz | |
merged
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(); |