diff options
| author | unknown <serg@serg.mylan> | 2005-06-01 09:35:35 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-01 09:35:35 +0200 |
| commit | 92f7de69f280ce49a2b09835718188cd102c2575 (patch) | |
| tree | 86d79f393a660f5153e41f71755a7cd8f6775320 | |
| parent | abbdab6ac9be805170ebdae4d0c68dc9c2ab9de4 (diff) | |
| parent | 51d8161d564ad6d78cfc34dbb316db7593e626c8 (diff) | |
| download | mariadb-git-92f7de69f280ce49a2b09835718188cd102c2575.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| -rw-r--r-- | include/mysql.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index b2b2e239758..84284fa0661 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -74,14 +74,14 @@ extern char *mysql_unix_port; #define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG) #define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG) #define IS_BLOB(n) ((n) & BLOB_FLAG) -#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR) +#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL) #define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG) #define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR) typedef struct st_mysql_field { char *name; /* Name of column */ - char *org_name; /* Original column name, if an alias */ + char *org_name; /* Original column name, if an alias */ char *table; /* Table of column if column was a field */ char *org_table; /* Org table name, if table was an alias */ char *db; /* Database for table */ |