diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
| commit | 9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62 (patch) | |
| tree | ed06f905f1515a2117cc0c243c526264fccaac77 /libmysql | |
| parent | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (diff) | |
| parent | ebb3bd0f75ecb2b89e4fe07c693caa9e09c2ce3a (diff) | |
| download | mariadb-git-9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
ltmain.sh:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 28248a0b982..ba97c7cf04d 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 22b3c75fcb9..378744b9f1b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -293,7 +293,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; @@ -415,7 +415,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) { |