mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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
This commit is contained in:
@@ -2230,32 +2230,32 @@ com_ego(String *buffer,char *line)
|
||||
static const char *fieldtype2str(enum enum_field_types type)
|
||||
{
|
||||
switch (type) {
|
||||
case FIELD_TYPE_BIT: return "BIT";
|
||||
case FIELD_TYPE_BLOB: return "BLOB";
|
||||
case FIELD_TYPE_DATE: return "DATE";
|
||||
case FIELD_TYPE_DATETIME: return "DATETIME";
|
||||
case FIELD_TYPE_NEWDECIMAL: return "NEWDECIMAL";
|
||||
case FIELD_TYPE_DECIMAL: return "DECIMAL";
|
||||
case FIELD_TYPE_DOUBLE: return "DOUBLE";
|
||||
case FIELD_TYPE_ENUM: return "ENUM";
|
||||
case FIELD_TYPE_FLOAT: return "FLOAT";
|
||||
case FIELD_TYPE_GEOMETRY: return "GEOMETRY";
|
||||
case FIELD_TYPE_INT24: return "INT24";
|
||||
case FIELD_TYPE_LONG: return "LONG";
|
||||
case FIELD_TYPE_LONGLONG: return "LONGLONG";
|
||||
case FIELD_TYPE_LONG_BLOB: return "LONG_BLOB";
|
||||
case FIELD_TYPE_MEDIUM_BLOB: return "MEDIUM_BLOB";
|
||||
case FIELD_TYPE_NEWDATE: return "NEWDATE";
|
||||
case FIELD_TYPE_NULL: return "NULL";
|
||||
case FIELD_TYPE_SET: return "SET";
|
||||
case FIELD_TYPE_SHORT: return "SHORT";
|
||||
case FIELD_TYPE_STRING: return "STRING";
|
||||
case FIELD_TYPE_TIME: return "TIME";
|
||||
case FIELD_TYPE_TIMESTAMP: return "TIMESTAMP";
|
||||
case FIELD_TYPE_TINY: return "TINY";
|
||||
case FIELD_TYPE_TINY_BLOB: return "TINY_BLOB";
|
||||
case FIELD_TYPE_VAR_STRING: return "VAR_STRING";
|
||||
case FIELD_TYPE_YEAR: return "YEAR";
|
||||
case MYSQL_TYPE_BIT: return "BIT";
|
||||
case MYSQL_TYPE_BLOB: return "BLOB";
|
||||
case MYSQL_TYPE_DATE: return "DATE";
|
||||
case MYSQL_TYPE_DATETIME: return "DATETIME";
|
||||
case MYSQL_TYPE_NEWDECIMAL: return "NEWDECIMAL";
|
||||
case MYSQL_TYPE_DECIMAL: return "DECIMAL";
|
||||
case MYSQL_TYPE_DOUBLE: return "DOUBLE";
|
||||
case MYSQL_TYPE_ENUM: return "ENUM";
|
||||
case MYSQL_TYPE_FLOAT: return "FLOAT";
|
||||
case MYSQL_TYPE_GEOMETRY: return "GEOMETRY";
|
||||
case MYSQL_TYPE_INT24: return "INT24";
|
||||
case MYSQL_TYPE_LONG: return "LONG";
|
||||
case MYSQL_TYPE_LONGLONG: return "LONGLONG";
|
||||
case MYSQL_TYPE_LONG_BLOB: return "LONG_BLOB";
|
||||
case MYSQL_TYPE_MEDIUM_BLOB: return "MEDIUM_BLOB";
|
||||
case MYSQL_TYPE_NEWDATE: return "NEWDATE";
|
||||
case MYSQL_TYPE_NULL: return "NULL";
|
||||
case MYSQL_TYPE_SET: return "SET";
|
||||
case MYSQL_TYPE_SHORT: return "SHORT";
|
||||
case MYSQL_TYPE_STRING: return "STRING";
|
||||
case MYSQL_TYPE_TIME: return "TIME";
|
||||
case MYSQL_TYPE_TIMESTAMP: return "TIMESTAMP";
|
||||
case MYSQL_TYPE_TINY: return "TINY";
|
||||
case MYSQL_TYPE_TINY_BLOB: return "TINY_BLOB";
|
||||
case MYSQL_TYPE_VAR_STRING: return "VAR_STRING";
|
||||
case MYSQL_TYPE_YEAR: return "YEAR";
|
||||
default: return "?-unknown-?";
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user