diff options
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 035fb1211e6..a5676b8989a 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -48,20 +48,20 @@ struct Field_definition static Field_definition sequence_structure[]= { - {"next_not_cached_value", 21, &type_handler_longlong, + {"next_not_cached_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, - {"minimum_value", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, FL}, - {"maximum_value", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, FL}, - {"start_value", 21, &type_handler_longlong, {STRING_WITH_LEN("start value when sequences is created or value if RESTART is used")}, FL}, - {"increment", 21, &type_handler_longlong, + {"minimum_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, + {"maximum_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, + {"start_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("start value when sequences is created or value if RESTART is used")}, FL}, + {"increment", 21, &type_handler_slonglong, {STRING_WITH_LEN("increment value")}, FL}, - {"cache_size", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, + {"cache_size", 21, &type_handler_ulonglong, {STRING_WITH_LEN("")}, FL | UNSIGNED_FLAG}, - {"cycle_option", 1, &type_handler_tiny, {STRING_WITH_LEN("0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed")}, + {"cycle_option", 1, &type_handler_utiny, {STRING_WITH_LEN("0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed")}, FL | UNSIGNED_FLAG }, - {"cycle_count", 21, &type_handler_longlong, + {"cycle_count", 21, &type_handler_slonglong, {STRING_WITH_LEN("How many cycles have been done")}, FL}, - {NULL, 0, &type_handler_longlong, {STRING_WITH_LEN("")}, 0} + {NULL, 0, &type_handler_slonglong, {STRING_WITH_LEN("")}, 0} }; #undef FL @@ -452,10 +452,9 @@ int SEQUENCE::read_initial_values(TABLE *table) where we don't have a mdl lock on the table */ - mdl_request.init(MDL_key::TABLE, - table->s->db.str, - table->s->table_name.str, - MDL_SHARED_READ, MDL_EXPLICIT); + MDL_REQUEST_INIT(&mdl_request, MDL_key::TABLE, table->s->db.str, + table->s->table_name.str, MDL_SHARED_READ, + MDL_EXPLICIT); mdl_requests.push_front(&mdl_request); if (thd->mdl_context.acquire_locks(&mdl_requests, thd->variables.lock_wait_timeout)) |