diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-17 16:59:26 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-17 16:59:26 +0300 |
| commit | 02e7537f1c3eaffd1d6152f8f148c60378389803 (patch) | |
| tree | 6dabf9f188bdd0109644c9a599ca77398624fd18 /sql/mysql_priv.h | |
| parent | 1e62af865bae69c71bb650fede309d5b9ea6ba44 (diff) | |
| parent | 512e8153cf502f0eca949202ea07d25c60486851 (diff) | |
| download | mariadb-git-02e7537f1c3eaffd1d6152f8f148c60378389803.tar.gz | |
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
sql/mysql_priv.h:
Auto merged
sql/item.cc:
SCCS merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ea552414d9a..2c0d4d6e2eb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -74,6 +74,7 @@ extern const char *primary_key_name; #include "mysql_com.h" #include <violite.h> #include "unireg.h" +#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL) void init_sql_alloc(MEM_ROOT *root, uint block_size, uint pre_alloc_size); void *sql_alloc(size_t); |