summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 19:21:54 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 19:21:54 +0300
commitfa147843018ba14136c0a65a2cfcf53af2938958 (patch)
treee0d8cb9dd610cd3e13e544dfcaa12df8154ae830
parentc0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff)
downloadmariadb-git-fa147843018ba14136c0a65a2cfcf53af2938958.tar.gz
Fix more -Wnonnull-compare
For some reason, GCC 8 did not issue warnings for all such comparisons.
-rw-r--r--storage/innobase/trx/trx0rec.cc1
-rw-r--r--storage/xtradb/trx/trx0rec.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc
index c21b5d6772c..f70f8a61388 100644
--- a/storage/innobase/trx/trx0rec.cc
+++ b/storage/innobase/trx/trx0rec.cc
@@ -1087,7 +1087,6 @@ trx_undo_rec_get_partial_row(
const byte* end_ptr;
ulint row_len;
- ut_ad(ptr);
ut_ad(dict_index_is_clust(index));
row_len = dict_table_get_n_cols(index->table);
diff --git a/storage/xtradb/trx/trx0rec.cc b/storage/xtradb/trx/trx0rec.cc
index e4a8d1b2d82..351f65bb943 100644
--- a/storage/xtradb/trx/trx0rec.cc
+++ b/storage/xtradb/trx/trx0rec.cc
@@ -1087,7 +1087,6 @@ trx_undo_rec_get_partial_row(
const byte* end_ptr;
ulint row_len;
- ut_ad(ptr);
ut_ad(dict_index_is_clust(index));
row_len = dict_table_get_n_cols(index->table);