diff options
| author | mskold@mysql.com <> | 2005-02-11 22:30:37 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-02-11 22:30:37 +0100 |
| commit | 66343612d148eded29c0a20e6272b52cd9cc6d74 (patch) | |
| tree | 5327def971aba5514d2e7523671b429ff151d7b7 /include/mysql_com.h | |
| parent | 828a7856103aec08b006bdb46b382a2c305f8066 (diff) | |
| parent | d39328793e5ee3bbefd4de435b4a3fce825aae74 (diff) | |
| download | mariadb-git-66343612d148eded29c0a20e6272b52cd9cc6d74.tar.gz | |
Merge
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 8d4340f2cb6..22250e4b03e 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -211,6 +211,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR, MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR, MYSQL_TYPE_BIT, + MYSQL_TYPE_NEWDECIMAL=246, MYSQL_TYPE_ENUM=247, MYSQL_TYPE_SET=248, MYSQL_TYPE_TINY_BLOB=249, @@ -226,6 +227,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, /* For backward compatibility */ #define CLIENT_MULTI_QUERIES CLIENT_MULTI_STATEMENTS #define FIELD_TYPE_DECIMAL MYSQL_TYPE_DECIMAL +#define FIELD_TYPE_NEWDECIMAL MYSQL_TYPE_NEWDECIMAL #define FIELD_TYPE_TINY MYSQL_TYPE_TINY #define FIELD_TYPE_SHORT MYSQL_TYPE_SHORT #define FIELD_TYPE_LONG MYSQL_TYPE_LONG @@ -341,7 +343,8 @@ struct rand_struct { /* The following is for user defined functions */ -enum Item_result {STRING_RESULT= 0, REAL_RESULT, INT_RESULT, ROW_RESULT}; +enum Item_result {STRING_RESULT=0, REAL_RESULT, INT_RESULT, ROW_RESULT, + DECIMAL_RESULT}; typedef struct st_udf_args { |