diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:02:45 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:02:45 +0200 |
| commit | bc15643c82a049cd3a74ac921859623f9649cede (patch) | |
| tree | bbaeca91e6d0641c334a79ec109bcbec9f3a1832 /include/my_global.h | |
| parent | 6288ebb699563c86fbc26660f961fa0e381ae871 (diff) | |
| download | mariadb-git-bc15643c82a049cd3a74ac921859623f9649cede.tar.gz | |
fix after merge
Docs/manual.texi:
Fix after merge
include/my_global.h:
merge fix
mysql-test/r/create.result:
merge fix
mysys/thr_alarm.c:
Fix for using --debug with alarms
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 6a7385e18a2..9f3ad46c15c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -314,6 +314,7 @@ typedef unsigned short ushort; #define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); } #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); } #define test_all_bits(a,b) (((a) & (b)) == (b)) +#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1)) #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0]))) #ifndef HAVE_RINT #define rint(A) floor((A)+0.5) |