diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-24 10:42:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-24 10:42:08 +0300 |
| commit | 57ec41d6ea5d9384b45d026b70b3fd97ddd2861b (patch) | |
| tree | de37c621a2a021368d21701547b8d6df89a74a3d | |
| parent | 9f19dbe0c3f6bc3ee68c336869c186dd820107c0 (diff) | |
| download | mariadb-git-57ec41d6ea5d9384b45d026b70b3fd97ddd2861b.tar.gz | |
Cleanup: Remove a constant parameter
row_vers_vc_matches_cluster(): Remove the parameter in_purge,
which was always passed as in_purge=true.
This parameter became constant in
mysql/mysql-server@1dec14d346ac55fe72989dccb071f84b3b0d3bd6
and it always was constant in MariaDB starting from the
introduction of the function in
commit 2e814d4702d71a04388386a9f591d14a35980bfe (MariaDB 10.2.2).
| -rw-r--r-- | storage/innobase/row/row0vers.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc index 3a4b560670f..b3d0e93b732 100644 --- a/storage/innobase/row/row0vers.cc +++ b/storage/innobase/row/row0vers.cc @@ -619,7 +619,6 @@ row_vers_build_cur_vrow_low( /** Check a virtual column value index secondary virtual index matches that of current cluster index record, which is recreated from information stored in undo log -@param[in] in_purge called by purge thread @param[in] rec record in the clustered index @param[in] icentry the index entry built from a cluster row @param[in] clust_index cluster index @@ -635,7 +634,6 @@ stored in undo log static bool row_vers_vc_matches_cluster( - bool in_purge, const rec_t* rec, const dtuple_t* icentry, dict_index_t* clust_index, @@ -696,12 +694,6 @@ row_vers_vc_matches_cluster( version = rec; - /* If this is called by purge thread, set TRX_UNDO_PREV_IN_PURGE - bit to search the undo log until we hit the current undo log with - roll_ptr */ - ulint status = (in_purge ? TRX_UNDO_PREV_IN_PURGE : 0) - | TRX_UNDO_GET_OLD_V_VALUE; - while (n_cmp_v_col < n_fields - n_non_v_col) { heap2 = heap; heap = mem_heap_create(1024); @@ -709,11 +701,12 @@ row_vers_vc_matches_cluster( version, clust_index, clust_offsets); ut_ad(cur_roll_ptr != 0); - ut_ad(in_purge == (roll_ptr != 0)); + ut_ad(roll_ptr != 0); trx_undo_prev_version_build( rec, mtr, version, clust_index, clust_offsets, - heap, &prev_version, NULL, vrow, status); + heap, &prev_version, NULL, vrow, + TRX_UNDO_PREV_IN_PURGE | TRX_UNDO_GET_OLD_V_VALUE); if (heap2) { mem_heap_free(heap2); @@ -997,7 +990,7 @@ row_vers_old_has_index_entry( secondary indexes.) */ if (entry && row_vers_vc_matches_cluster( - also_curr, rec, entry, + rec, entry, clust_index, clust_offsets, index, ientry, roll_ptr, trx_id, NULL, &vrow, mtr)) { |