diff options
| author | monty@hundin.mysql.fi <> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-05 01:04:08 +0200 |
| commit | 3afb157ca21925c53724425785ab0769397e3b45 (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /include | |
| parent | 5609e21d70ef10ee498e6a1559a92b9e55648e5d (diff) | |
| download | mariadb-git-3afb157ca21925c53724425785ab0769397e3b45.tar.gz | |
Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index c9b9a4c2eae..53227d14c8c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -276,7 +276,7 @@ typedef unsigned int uint; typedef unsigned short ushort; #endif -#define CMP(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1) +#define CMP_NUM(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1) #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; } #define test(a) ((a) ? 1 : 0) 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 |