From d18a6cc33a220e056dfa1633b928ac0b1415789d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Nov 2001 01:04:08 +0200 Subject: Fixes up things after merge from 3.23.44 Portability fixes. Don't delete temporary tables on FLUSH tables. client/client_priv.h: Fix after merge client/mysqldump.c: Fix after merge include/my_global.h: Change CMP -> CMP_NUM because CMP was used in other places include/violite.h: Added missing prototype myisam/ft_boolean_search.c: Removed warnings myisam/ft_nlq_search.c: Removed warnings myisam/mi_search.c: CMP -> CMP_NUM mysql-test/mysql-test-run.sh: Write all logs to log directory mysql-test/r/func_time.result: Fix test results after merge mysql-test/r/having.result: Fix test results after merge mysql-test/r/join.result: Fix test results after merge mysql-test/r/rpl000012.result: Fix test results after merge mysys/mf_iocache.c: Allow multiple call to end_iocache. sql/ha_innobase.cc: Removed possible problem with using uninitialized variable sql/log_event.cc: Don't delete temporary tables on FLUSH tables. (Needs to be fixed properly) --- include/violite.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/violite.h') diff --git a/include/violite.h b/include/violite.h index 9a2146c1978..4e7e216805b 100644 --- a/include/violite.h +++ b/include/violite.h @@ -102,6 +102,8 @@ my_bool vio_peer_addr(Vio* vio, char *buf); void vio_in_addr(Vio *vio, struct in_addr *in); +my_bool vio_poll_read(Vio *vio,uint timeout); + #ifdef __cplusplus } #endif -- cgit v1.2.1