summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
authorbrian@zim.(none) <>2006-12-01 17:26:52 -0800
committerbrian@zim.(none) <>2006-12-01 17:26:52 -0800
commit31d67280f71b3ce47465c1844e09465e602522a4 (patch)
tree639841f522e1b6f8d34fa0aced9b6436eacaefe0 /include/mysql.h
parent082de8dfcee10c66ae0a23a88e501b5120f6625a (diff)
downloadmariadb-git-31d67280f71b3ce47465c1844e09465e602522a4.tar.gz
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
Diffstat (limited to 'include/mysql.h')
-rw-r--r--include/mysql.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h
index f2a82c99fc3..7f8941e68f1 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -85,9 +85,9 @@ 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 || (t) == FIELD_TYPE_NEWDECIMAL)
+#define IS_NUM(t) ((t) <= MYSQL_TYPE_INT24 || (t) == MYSQL_TYPE_YEAR || (t) == MYSQL_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)
+#define INTERNAL_NUM_FIELD(f) (((f)->type <= MYSQL_TYPE_INT24 && ((f)->type != MYSQL_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == MYSQL_TYPE_YEAR)
typedef struct st_mysql_field {