diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
| commit | d18a6cc33a220e056dfa1633b928ac0b1415789d (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /include | |
| parent | cec36f0f14b6c885aabe4eb989fb9ff4a4ae6a7c (diff) | |
| download | mariadb-git-d18a6cc33a220e056dfa1633b928ac0b1415789d.tar.gz | |
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)
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 |