diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 5 | ||||
| -rw-r--r-- | include/violite.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index bef7da93451..c7b5831a474 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -351,10 +351,9 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #define pthread_kill(A,B) pthread_dummy(0) #define pthread_condattr_init(A) pthread_dummy(0) #define pthread_condattr_destroy(A) pthread_dummy(0) -#define pthread_cond_init( A, B ) pthread_cond_init( (A), 0 ) #define pthread_signal(A,B) pthread_dummy(0) #undef pthread_detach_this_thread -#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); } +#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); } #undef sigset #define sigset(A,B) pthread_signal((A),(void (*)(int)) (B)) #endif diff --git a/include/my_sys.h b/include/my_sys.h index 3fc4fed3397..32b2d18fb4d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -59,6 +59,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_WME 16 /* Write message on error */ #define MY_WAIT_IF_FULL 32 /* Wait and try again if disk full error */ #define MY_RAID 64 /* Support for RAID (not the "Johnson&Johnson"-s one ;) */ +#define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */ #define MY_LINK_WARNING 32 /* my_redel() gives warning if links */ #define MY_COPYTIME 64 /* my_redel() copys time */ #define MY_HOLD_ORIGINAL_MODES 128 /* my_copy() holds to file modes */ @@ -506,6 +507,10 @@ extern int my_block_write(IO_CACHE *info, const byte *Buffer, uint Count, my_off_t pos); extern int flush_io_cache(IO_CACHE *info); extern int end_io_cache(IO_CACHE *info); +extern uint my_b_fill(IO_CACHE *info); +extern void my_b_seek(IO_CACHE *info,my_off_t pos); +extern uint my_b_gets(IO_CACHE *info, char *to, uint max_length); +extern uint my_b_printf(IO_CACHE *info, const char* fmt, ...); extern my_bool open_cached_file(IO_CACHE *cache,const char *dir, const char *prefix, uint cache_size, myf cache_myflags); diff --git a/include/violite.h b/include/violite.h index e7c3e8ede81..1f44c29ba65 100644 --- a/include/violite.h +++ b/include/violite.h @@ -108,6 +108,9 @@ my_bool vio_peer_addr(Vio * vio, char *buf); void vio_in_addr(Vio *vio, struct in_addr *in); + /* Return 1 if there is data to be read */ +my_bool vio_poll_read(Vio *vio,uint timeout); + #ifdef __cplusplus } #endif |