diff options
author | Monty <monty@mariadb.org> | 2017-12-22 14:56:09 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2017-12-22 14:56:58 +0200 |
commit | 9cc7789e9084e7d59a43f9560870e496843535f9 (patch) | |
tree | 71f18d4ae038bb59019a7812b22778500b6a8c0c /sql/sp_head.cc | |
parent | 5b4c8469d5e1988f6f7408fa6c7cc54f9bb1f290 (diff) | |
download | mariadb-git-9cc7789e9084e7d59a43f9560870e496843535f9.tar.gz |
MDEV 13679 Enabled sequences to be used in DEFAULT
Other changes done to get this to work:
- Added 'internal_tables' to TABLE object to list which sequence tables
is needed to use the table.
- Mark any expression using DEFAULT() with LEX->default_used.
This is needed when deciding if we should open internal sequence
tables when a table is opened (we don't need to open sequence tables
if the main table is only used with SELECT).
- Create_and_open_temporary_table() can now also open all internal
sequence tables.
- Added option MYSQL_LOCK_USE_MALLOC to mysql_lock_tables()
to force memory allocation to be used with malloc instead of
memroot.
- Added flag to MYSQL_LOCK to remember if allocation was done with
malloc or memroot (makes code simpler and safer).
- init_one_table_for_prelocking() now takes argument for what lock to
use instead of it's a routine or something else.
- Renamed prelocking placeholders to make them more understandable as
they are now used in more code.
- Changed test in check_lock_and_start_stmt() if found table has correct
locks. The old test didn't work for tables that has lock
TL_WRITE_ALLOW_WRITE, which is what sequence tables are using.
- Added VCOL_NOT_VIRTUAL option to ensure that sequence functions can't
be used with virtual columns
- More sequence tests
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index a0f0fb271ef..bcdef10506f 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -4654,7 +4654,8 @@ sp_head::add_used_tables_to_table_list(THD *thd, table->init_one_table_for_prelocking(key_buff, stab->db_length, key_buff + stab->db_length + 1, stab->table_name_length, key_buff + stab->db_length + stab->table_name_length + 2, - stab->lock_type, true, belong_to_view, stab->trg_event_map, + stab->lock_type, TABLE_LIST::PRELOCK_ROUTINE, belong_to_view, + stab->trg_event_map, query_tables_last_ptr); tab_buff+= ALIGN_SIZE(sizeof(TABLE_LIST)); |