mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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)
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user