mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix test failures seen on buildbot.

Browse source
This commit is contained in:
Jan Lindström 2015-10-30 08:37:40 +02:00
parent 923827e2cc
commit 3e98383787
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/btr/btr0cur.cc
View file

@ -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;
}

3
storage/xtradb/btr/btr0cur.cc
View file

@ -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;
}