diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-05 07:00:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-05 07:00:18 +0400 |
| commit | aacb4d57ca5ac2dfb71bedd5b992c157b8f53b79 (patch) | |
| tree | f17c1ef60d2ac771df983d62fe9103113f1632a0 /sql/sql_sequence.cc | |
| parent | 1ff79562b87e2fb665bccf5c5979294fabca25f6 (diff) | |
| download | mariadb-git-aacb4d57ca5ac2dfb71bedd5b992c157b8f53b79.tar.gz | |
MDEV-12695 Add Column_definition::type_handler()
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 19ba20d78cd..98912691904 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -27,7 +27,7 @@ struct Field_definition { const char *field_name; uint length; - enum enum_field_types sql_type; + const Type_handler *type_handler; LEX_CSTRING comment; ulong flags; }; @@ -45,19 +45,19 @@ struct Field_definition static Field_definition sequence_structure[]= { - {"next_value", 21, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("next not cached value")}, + {"next_value", 21, &type_handler_longlong, {STRING_WITH_LEN("next not cached value")}, FL}, - {"min_value", 21, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("min value")}, FL}, - {"max_value", 21, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("max value")}, FL}, - {"start", 21, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("start value")}, FL}, - {"increment", 21, MYSQL_TYPE_LONGLONG, + {"min_value", 21, &type_handler_longlong, {STRING_WITH_LEN("min value")}, FL}, + {"max_value", 21, &type_handler_longlong, {STRING_WITH_LEN("max value")}, FL}, + {"start", 21, &type_handler_longlong, {STRING_WITH_LEN("start value")}, FL}, + {"increment", 21, &type_handler_longlong, {C_STRING_WITH_LEN("increment value")}, FL}, - {"cache", 21, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("cache size")}, FL}, - {"cycle", 1, MYSQL_TYPE_TINY, {STRING_WITH_LEN("cycle state")}, + {"cache", 21, &type_handler_longlong, {STRING_WITH_LEN("cache size")}, FL}, + {"cycle", 1, &type_handler_tiny, {STRING_WITH_LEN("cycle state")}, FL | UNSIGNED_FLAG }, - {"round", 21, MYSQL_TYPE_LONGLONG, + {"round", 21, &type_handler_longlong, {STRING_WITH_LEN("How many cycles has been done")}, FL}, - {NULL, 0, MYSQL_TYPE_LONGLONG, {STRING_WITH_LEN("")}, 0} + {NULL, 0, &type_handler_longlong, {STRING_WITH_LEN("")}, 0} }; #undef FL @@ -196,7 +196,7 @@ bool check_sequence_fields(LEX *lex, List<Create_field> *fields) if (my_strcasecmp(system_charset_info, field_def->field_name, field->field_name.str) || field->flags != field_def->flags || - field->sql_type != field_def->sql_type) + field->type_handler() != field_def->type_handler) { reason= field->field_name.str; goto err; @@ -235,7 +235,7 @@ bool prepare_sequence_fields(THD *thd, List<Create_field> *fields) DBUG_RETURN(TRUE); /* purify inspected */ new_field->field_name= field_name; - new_field->sql_type= field_info->sql_type; + new_field->set_handler(field_info->type_handler); new_field->length= field_info->length; new_field->char_length= field_info->length; new_field->comment= field_info->comment; |