diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:50:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:02:55 +0300 |
| commit | 03672a0573566cdb31a5ad3a925f80d2560ebc9b (patch) | |
| tree | 70f862ad3c564f9615a54abaa2348ec3f1ec561f /storage/innobase/include/dict0dict.ic | |
| parent | dbc716675b183dc972a40dd1320f4bdae04c1f29 (diff) | |
| download | mariadb-git-03672a0573566cdb31a5ad3a925f80d2560ebc9b.tar.gz | |
MDEV-11487: Remove dict_table_get_n_sys_cols()
In MariaDB, InnoDB tables will always contain DATA_N_SYS_COLS = 3
columns, 2 or 3 of which are present in the clustered index.
We remove the predicate that was added in MySQL 5.7 as part of WL#7682.
Diffstat (limited to 'storage/innobase/include/dict0dict.ic')
| -rw-r--r-- | storage/innobase/include/dict0dict.ic | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 6b081640aae..6178b40927c 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -475,13 +475,11 @@ dict_table_get_sys_col( { dict_col_t* col; - ut_ad(table); - ut_ad(sys < dict_table_get_n_sys_cols(table)); + ut_ad(sys < DATA_N_SYS_COLS); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); col = dict_table_get_nth_col(table, table->n_cols - - dict_table_get_n_sys_cols(table) - + sys); + + (sys - DATA_N_SYS_COLS)); ut_ad(col->mtype == DATA_SYS); ut_ad(col->prtype == (sys | DATA_NOT_NULL)); @@ -501,7 +499,7 @@ dict_table_get_sys_col_no( { ut_ad(sys < DATA_N_SYS_COLS); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); - return(table->n_cols - dict_table_get_n_sys_cols(table) + sys); + return table->n_cols + (sys - DATA_N_SYS_COLS); } /********************************************************************//** |