diff options
| author | unknown <brian@zim.(none)> | 2006-12-01 17:26:52 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-12-01 17:26:52 -0800 |
| commit | d6541d099b6873099a3fb5179e8ab7476cdac17d (patch) | |
| tree | 639841f522e1b6f8d34fa0aced9b6436eacaefe0 /include/mysql.h | |
| parent | 46fd7deccbf9fcf75640ecdaa52667fc0d8e5832 (diff) | |
| download | mariadb-git-d6541d099b6873099a3fb5179e8ab7476cdac17d.tar.gz | |
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
client/mysql.cc:
Field update to MYSQL
client/mysqldump.c:
Field -> MySQL
include/mysql.h:
Field -> MySQL
server-tools/instance-manager/protocol.cc:
Field -> MySQL
sql/field.cc:
Field -> MySQL
sql/field.h:
Field -> MySQL
sql/field_conv.cc:
Field -> MySQL
sql/handler.cc:
Field -> MySQL
sql/item.cc:
Field -> MYSQL
sql/item_func.cc:
Field -> MySQL
sql/item_subselect.cc:
Field -> MySQL
sql/item_subselect.h:
Field -> MySQL
sql/item_sum.h:
Field -> MySQL
sql/item_timefunc.cc:
Field -> MySQL
sql/log_event.cc:
Field -> MySQL
sql/opt_range.cc:
Field -> MySQL
sql/sp.cc:
Field -> MySQL
sql/sql_acl.cc:
Field -> MYSQL
sql/sql_analyse.cc:
Field -> MYSQL
sql/sql_insert.cc:
Field -> MySQL
sql/sql_load.cc:
Field -> MySQL
sql/sql_parse.cc:
Field -> MySQL
sql/sql_select.cc:
Field -> MySQL
sql/sql_select.h:
Field -> MySQL
sql/sql_show.cc:
Field -> MySQL
sql/sql_table.cc:
Field -> MySQL
sql/sql_yacc.yy:
Field -> MySQL
sql/table.cc:
Field -> MySQL
sql/unireg.cc:
Field -> MySQL
storage/innobase/handler/ha_innodb.cc:
Field -> MySQL
storage/myisam/ha_myisam.cc:
Field -> MySQL
tests/mysql_client_test.c:
Field -> MySQL
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index f2a82c99fc3..7f8941e68f1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -85,9 +85,9 @@ extern char *mysql_unix_port; #define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG) #define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG) #define IS_BLOB(n) ((n) & BLOB_FLAG) -#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL) +#define IS_NUM(t) ((t) <= MYSQL_TYPE_INT24 || (t) == MYSQL_TYPE_YEAR || (t) == MYSQL_TYPE_NEWDECIMAL) #define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG) -#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR) +#define INTERNAL_NUM_FIELD(f) (((f)->type <= MYSQL_TYPE_INT24 && ((f)->type != MYSQL_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == MYSQL_TYPE_YEAR) typedef struct st_mysql_field { |