diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-02-10 18:01:06 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-02-10 18:01:06 +0200 |
| commit | 72eb17f18d7e8094152aa2c3757f6d5ab24f9f76 (patch) | |
| tree | 828e47008d5e9d854ff445efdc1768f3619981f4 /include/mysql_com.h | |
| parent | c02f4c5b6c1ee39b62a2074db476cde0632d5f62 (diff) | |
| parent | 7684e10018503eba3bf281d587993761fae6e5fb (diff) | |
| download | mariadb-git-72eb17f18d7e8094152aa2c3757f6d5ab24f9f76.tar.gz | |
merge
include/mysql_com.h:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 78d71bde1cf..3165ca4c4c3 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -216,6 +216,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, @@ -231,6 +232,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 @@ -346,7 +348,8 @@ struct rand_struct { /* The following is for user defined functions */ -enum Item_result {STRING_RESULT, REAL_RESULT, INT_RESULT, ROW_RESULT}; +enum Item_result {STRING_RESULT, REAL_RESULT, INT_RESULT, ROW_RESULT, + DECIMAL_RESULT}; typedef struct st_udf_args { |