diff options
| author | unknown <dlenev@mysql.com> | 2005-01-18 17:05:09 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-01-18 17:05:09 +0300 |
| commit | 9ed0d855502adec04e088d2f6f1b3bf58dca44d5 (patch) | |
| tree | d5db75726219ea74f571a525a42e1c51e8282f73 | |
| parent | 7f4bb64a75224dd471d121c1ac6d3a4dc1cbb0b2 (diff) | |
| parent | b1a0f67a03e782495e027588c7c7bc204f0a82b6 (diff) | |
| download | mariadb-git-9ed0d855502adec04e088d2f6f1b3bf58dca44d5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
| -rw-r--r-- | sql/field.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/field.h b/sql/field.h index c42f5f63f0c..87a9732b41e 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1101,10 +1101,10 @@ bool test_if_int(const char *str,int length); #define FIELDFLAG_NUMBER 2 #define FIELDFLAG_ZEROFILL 4 #define FIELDFLAG_PACK 120 // Bits used for packing -#define FIELDFLAG_INTERVAL 256 -#define FIELDFLAG_BITFIELD 512 // mangled with dec! -#define FIELDFLAG_BLOB 1024 // mangled with dec! -#define FIELDFLAG_GEOM 2048 +#define FIELDFLAG_INTERVAL 256 // mangled with decimals! +#define FIELDFLAG_BITFIELD 512 // mangled with decimals! +#define FIELDFLAG_BLOB 1024 // mangled with decimals! +#define FIELDFLAG_GEOM 2048 // mangled with decimals! #define FIELDFLAG_LEFT_FULLSCREEN 8192 #define FIELDFLAG_RIGHT_FULLSCREEN 16384 #define FIELDFLAG_FORMAT_NUMBER 16384 // predit: ###,,## in output @@ -1128,10 +1128,10 @@ bool test_if_int(const char *str,int length); #define f_decimals(x) ((uint8) (((x) >> FIELDFLAG_DEC_SHIFT) & FIELDFLAG_MAX_DEC)) #define f_is_alpha(x) (!f_is_num(x)) #define f_is_binary(x) ((x) & FIELDFLAG_BINARY) -#define f_is_enum(x) ((x) & FIELDFLAG_INTERVAL) -#define f_is_bitfield(x) ((x) & FIELDFLAG_BITFIELD) +#define f_is_enum(x) (((x) & (FIELDFLAG_INTERVAL | FIELDFLAG_NUMBER)) == FIELDFLAG_INTERVAL) +#define f_is_bitfield(x) (((x) & (FIELDFLAG_BITFIELD | FIELDFLAG_NUMBER)) == FIELDFLAG_BITFIELD) #define f_is_blob(x) (((x) & (FIELDFLAG_BLOB | FIELDFLAG_NUMBER)) == FIELDFLAG_BLOB) -#define f_is_geom(x) ((x) & FIELDFLAG_GEOM) +#define f_is_geom(x) (((x) & (FIELDFLAG_GEOM | FIELDFLAG_NUMBER)) == FIELDFLAG_GEOM) #define f_is_equ(x) ((x) & (1+2+FIELDFLAG_PACK+31*256)) #define f_settype(x) (((int) x) << FIELDFLAG_PACK_SHIFT) #define f_maybe_null(x) (x & FIELDFLAG_MAYBE_NULL) |