diff options
| author | unknown <mskold@mysql.com> | 2004-12-20 14:13:41 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-12-20 14:13:41 +0100 |
| commit | 33bc1b78c6724cb48ca1c9a32765618eccb8d8db (patch) | |
| tree | 7e89e7a5d1ce35a94133413a066309c44e4b8b25 /include/mysql_com.h | |
| parent | 347e777e3e58a060f6435eb3e5ad3c39a7b5bdad (diff) | |
| parent | 2dab2c1e6629384dfb13ff2d25ae8e80dfdaad9b (diff) | |
| download | mariadb-git-33bc1b78c6724cb48ca1c9a32765618eccb8d8db.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
include/mysql_com.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index c55cc997648..8d4340f2cb6 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -210,6 +210,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, MYSQL_TYPE_DATE, MYSQL_TYPE_TIME, MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR, MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR, + MYSQL_TYPE_BIT, MYSQL_TYPE_ENUM=247, MYSQL_TYPE_SET=248, MYSQL_TYPE_TINY_BLOB=249, @@ -250,6 +251,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, #define FIELD_TYPE_CHAR MYSQL_TYPE_TINY #define FIELD_TYPE_INTERVAL MYSQL_TYPE_ENUM #define FIELD_TYPE_GEOMETRY MYSQL_TYPE_GEOMETRY +#define FIELD_TYPE_BIT MYSQL_TYPE_BIT /* Shutdown/kill enums and constants */ |