diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-18 07:44:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-18 07:44:42 +0200 |
| commit | 86579e5a12d39681e635b359c03eb025f5439a58 (patch) | |
| tree | 8122180e5acd5a773711bcce35e36b6aeaf45dc0 | |
| parent | 8ea602349b40955d3ed190dc587d9a1ec2223510 (diff) | |
| download | mariadb-git-tt-10.3-trxid_fixes.tar.gz | |
Minor cleanuptt-10.3-trxid_fixes
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/include/dict0mem.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b4b1318d942..6b0b49908c8 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11039,7 +11039,8 @@ err_col: j++; } - ut_ad(have_vers_start == have_vers_end && table->versioned() == have_vers_start); + ut_ad(have_vers_start == have_vers_end); + ut_ad(table->versioned() == have_vers_start); ut_ad(!table->versioned() || table->vers_start != table->vers_end); if (num_v) { diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 88f29457263..1a22470569e 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -1605,8 +1605,8 @@ struct dict_table_t { /** @return whether the table is versioned. It is assumed that both vers_start and vers_end set to 0 - iff table is not versioned. In any other case these fields correspond to - actual positions in cols[]. */ + iff table is not versioned. In any other case, + these fields correspond to actual positions in cols[]. */ bool versioned() const { return vers_start || vers_end; } bool versioned_by_id() const { |