diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 09:41:54 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 09:41:54 +0200 |
commit | 5a1a7141870459cf66d8e441b443187f87a10d5d (patch) | |
tree | a49a388a0879a965ac9e89bc05f52f92d0f306b2 /sql/table.h | |
parent | df1eefb2ad138846269d40372678af805589700a (diff) | |
parent | 3b548d3bbf888e7c9e9853cf826e528b5195d8bd (diff) | |
download | mariadb-git-5a1a7141870459cf66d8e441b443187f87a10d5d.tar.gz |
Merge 10.2 into 10.3 (except MDEV-17556)
The fix of MDEV-17556 (commit e25623e78a3efde05e30070dc7362f8dc0d8c459
and commit 61a362c9493df63dc588fcb71409537ae56ab9c8) has been
omitted due to conflicts and will have to be applied separately later.
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 1247840c605..1134610284b 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2484,8 +2484,12 @@ struct TABLE_LIST Indicates what triggers we need to pre-load for this TABLE_LIST when opening an associated TABLE. This is filled after the parsed tree is created. + + slave_fk_event_map is filled on the slave side with bitmaps value + representing row-based event operation to help find and prelock + possible FK constrain-related child tables. */ - uint8 trg_event_map; + uint8 trg_event_map, slave_fk_event_map; /* TRUE <=> this table is a const one and was optimized away. */ bool optimized_away; |