diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-07-17 16:56:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-04 08:37:44 +0200 |
| commit | 64a23c1c8a826a6f58f8a415f60a0e3cc0e0375f (patch) | |
| tree | c0bfa925e95c87ac2dbe5df372fd884645033693 /sql/table.h | |
| parent | 3b365fa82917ea0a29e11f160a80707d27b9948a (diff) | |
| download | mariadb-git-64a23c1c8a826a6f58f8a415f60a0e3cc0e0375f.tar.gz | |
extend prelocking to FK-accessed tables
Backport of f1362910980
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index 5e99c89150b..9ba282b8c49 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1713,6 +1713,7 @@ struct TABLE_LIST size_t table_name_length_arg, const char *alias_arg, enum thr_lock_type lock_type_arg, + bool routine, TABLE_LIST *belong_to_view_arg, uint8 trg_event_map_arg, TABLE_LIST ***last_ptr) @@ -1720,7 +1721,8 @@ struct TABLE_LIST init_one_table(db_name_arg, db_length_arg, table_name_arg, table_name_length_arg, alias_arg, lock_type_arg); cacheable_table= 1; - prelocking_placeholder= 1; + prelocking_placeholder= routine ? ROUTINE : FK; + open_type= routine ? OT_TEMPORARY_OR_BASE : OT_BASE_ONLY; belong_to_view= belong_to_view_arg; trg_event_map= trg_event_map_arg; @@ -2004,7 +2006,7 @@ struct TABLE_LIST This TABLE_LIST object is just placeholder for prelocking, it will be used for implicit LOCK TABLES only and won't be used in real statement. */ - bool prelocking_placeholder; + enum { USER, ROUTINE, FK } prelocking_placeholder; /** Indicates that if TABLE_LIST object corresponds to the table/view which requires special handling. |