diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2020-04-04 01:07:24 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2020-04-04 01:07:24 +0300 |
| commit | 40f4d8c6715320aa3188f46bbc9958cd4768d0fa (patch) | |
| tree | dd7776aeac1110a825279fd1a9b8fccaaf75bf6f | |
| parent | 105b879d0f541f049a131a5c3b99d678fc7d3213 (diff) | |
| download | mariadb-git-40f4d8c6715320aa3188f46bbc9958cd4768d0fa.tar.gz | |
MDEV-21941 assertion cleanups
| -rw-r--r-- | sql/table.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/table.h b/sql/table.h index 67127166ffa..ce8f204f3ac 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1603,13 +1603,11 @@ public: bool versioned() const { - DBUG_ASSERT(s); return s->versioned; } bool versioned(vers_kind_t type) const { - DBUG_ASSERT(s); DBUG_ASSERT(type); return s->versioned == type; } @@ -1629,25 +1627,25 @@ public: Field *vers_start_field() const { - DBUG_ASSERT(s && s->versioned); + DBUG_ASSERT(s->versioned); return field[s->vers.start_fieldno]; } Field *vers_end_field() const { - DBUG_ASSERT(s && s->versioned); + DBUG_ASSERT(s->versioned); return field[s->vers.end_fieldno]; } Field *period_start_field() const { - DBUG_ASSERT(s && s->period.name); + DBUG_ASSERT(s->period.name); return field[s->period.start_fieldno]; } Field *period_end_field() const { - DBUG_ASSERT(s && s->period.name); + DBUG_ASSERT(s->period.name); return field[s->period.end_fieldno]; } |