diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-09 18:16:43 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-09 18:16:43 -0600 |
| commit | 8ddf0c441464bcb19595ff7735d3f0de8a54318f (patch) | |
| tree | 9d06bd339f6bb64b768d1643ebf486cac78790a1 /sql/log_event.h | |
| parent | c67510f0939fbcad4f2f0efcc79272322d5ffa57 (diff) | |
| download | mariadb-git-8ddf0c441464bcb19595ff7735d3f0de8a54318f.tar.gz | |
mysqlbinlog->client
BitKeeper/etc/ignore:
Added client/log_event.cc client/log_event.h client/mf_iocache.c client/mf_iocache.cc client/mysqlbinlog client/mysys_priv.h mysql.kdevprj to the ignore list
Makefile.am:
do symlink hack in the client directory
( originally needed to get log_event.cc for mysqlbinlog)
client/mysqlbinlog.cc:
fixes to make it compile in the client directory
libmysql/Makefile.shared:
link mysqlbinlog dependencies into libmysqlclient
libmysql/libmysql.c:
make simple_command and net_safe_read extern ( for mysqlbinlog)
sql/log_event.cc:
removed pthread dependency in mysqlbinlog
sql/log_event.h:
removed pthread dependency in mysqlbinlog
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 8d8ac183f61..94f7cce0e35 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -105,8 +105,12 @@ public: void print_timestamp(FILE* file, time_t *ts = 0); void print_header(FILE* file); +#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); #ifndef MYSQL_CLIENT |