diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-18 18:23:05 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-18 18:23:05 +0200 |
| commit | a09384cba0fa5ed8ab84cc2ee070c7e5fb6d0c18 (patch) | |
| tree | 9fffccb62646d91cd359be7df8ec4fdbde22193c /sql | |
| parent | 06c85bc1f0bf06872c1f11bc42d268331f492437 (diff) | |
| parent | 0ef346047d744225372dbb325ff9f398c64b0c2b (diff) | |
| download | mariadb-git-a09384cba0fa5ed8ab84cc2ee070c7e5fb6d0c18.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/warnings-5.1-opt
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 1 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 049740f8538..c0d78aa4492 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -18,6 +18,7 @@ #pragma implementation // gcc: Class implementation #endif #include "mysql_priv.h" +#include <mysql.h> #include <m_ctype.h> #include "my_dir.h" #include "sp_rcontext.h" diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 2c0d4d6e2eb..ea552414d9a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -74,7 +74,6 @@ 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); |