From 3e98383787da6428fc9c451a8113fa21a5e8ad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Fri, 30 Oct 2015 08:37:40 +0200 Subject: [PATCH] Fix test failures seen on buildbot. --- storage/innobase/btr/btr0cur.cc | 3 ++- storage/xtradb/btr/btr0cur.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index a8ce43741ef..9588efcca27 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -5152,7 +5152,7 @@ btr_free_externally_stored_field( /* In the rollback, we may encounter a clustered index record with some unwritten off-page columns. There is nothing to free then. */ - if (rb_ctx != RB_NONE) { + if (rb_ctx == RB_NONE) { char buf[3 * 512]; char *bufend; ulint ispace = dict_index_get_space(index); @@ -5167,6 +5167,7 @@ btr_free_externally_stored_field( rb_ctx, index->table->name, buf, space_id, ispace); } + ut_a(rb_ctx != RB_NONE); return; } diff --git a/storage/xtradb/btr/btr0cur.cc b/storage/xtradb/btr/btr0cur.cc index e84aaf1a54f..a8eeef416c6 100644 --- a/storage/xtradb/btr/btr0cur.cc +++ b/storage/xtradb/btr/btr0cur.cc @@ -5338,7 +5338,7 @@ btr_free_externally_stored_field( /* In the rollback, we may encounter a clustered index record with some unwritten off-page columns. There is nothing to free then. */ - if (rb_ctx != RB_NONE) { + if (rb_ctx == RB_NONE) { char buf[3 * 512]; char *bufend; ulint ispace = dict_index_get_space(index); @@ -5353,6 +5353,7 @@ btr_free_externally_stored_field( rb_ctx, index->table->name, buf, space_id, ispace); } + ut_a(rb_ctx != RB_NONE); return; }