From acfc500d037bbe1e2d9de8d713e3cf01bb7716aa Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 2 Aug 2020 19:42:45 +0200 Subject: compilation error on bintar-centos6-amd64-debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /home/buildbot/buildbot/build/storage/xtradb/mtr/mtr0mtr.cc:97:37: error: invalid access to non-static data member ‘fil_space_t::latch’ of NULL object [-Werror=invalid-offsetof] --- storage/xtradb/mtr/mtr0mtr.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/storage/xtradb/mtr/mtr0mtr.cc b/storage/xtradb/mtr/mtr0mtr.cc index a04f9cc84a3..ce1002a00f0 100644 --- a/storage/xtradb/mtr/mtr0mtr.cc +++ b/storage/xtradb/mtr/mtr0mtr.cc @@ -93,8 +93,7 @@ mtr_memo_slot_release_func( { fil_space_t* space = reinterpret_cast( static_cast(object) - - reinterpret_cast( - &static_cast(0)->latch)); + - my_offsetof(fil_space_t, latch)); space->committed_size = space->size; rw_lock_x_unlock(&space->latch); } -- cgit v1.2.1 From 8bca92c8845212ea96be404e664f4cbb45f93e2d Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 3 Aug 2020 13:03:37 +0300 Subject: Fix the typo in fix for MDEV-21472 --- sql/sql_admin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index beecf3fae64..3f518312526 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -738,7 +738,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, */ collect_eis= (table->table->s->table_category == TABLE_CATEGORY_USER && - !(lex->alter_info.flags &= Alter_info::ALTER_ADMIN_PARTITION) && + !(lex->alter_info.flags & Alter_info::ALTER_ADMIN_PARTITION) && (get_use_stat_tables_mode(thd) > NEVER || lex->with_persistent_for_clause)); -- cgit v1.2.1