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 /libmysql | |
| 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 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index b6ea5832e04..e9e100e38b1 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -55,7 +55,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ - charset.lo hash.lo + charset.lo hash.lo mf_iocache.lo my_seek.lo \ + my_pread.lo mf_cache.lo # Not needed in the minimum library mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo mysysobjects = $(mysysobjects1) $(mysysobjects2) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9221812ea65..4101fe18ea1 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -287,7 +287,7 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host, ** or packet is an error message *****************************************************************************/ -static uint +uint net_safe_read(MYSQL *mysql) { NET *net= &mysql->net; @@ -417,7 +417,7 @@ static void free_rows(MYSQL_DATA *cur) } -static int +int simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, uint length, my_bool skipp_check) { |