diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:04:32 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:04:32 +0200 |
| commit | 555c6632c69d707cc1641ef396e7b66a65f14bdc (patch) | |
| tree | 3cb474f914902dde2f8687c039ae3c3908825a12 | |
| parent | dc716da4571465af3adadcd2c471f11fef3a2191 (diff) | |
| parent | 8bca92c8845212ea96be404e664f4cbb45f93e2d (diff) | |
| download | mariadb-git-555c6632c69d707cc1641ef396e7b66a65f14bdc.tar.gz | |
Merge branch '10.1' into 10.2
| -rw-r--r-- | sql/sql_admin.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/mtr/mtr0mtr.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index ed0f37b8e75..af4b9127f8f 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -776,7 +776,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)); } 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<fil_space_t*>( static_cast<char*>(object) - - reinterpret_cast<char*>( - &static_cast<fil_space_t*>(0)->latch)); + - my_offsetof(fil_space_t, latch)); space->committed_size = space->size; rw_lock_x_unlock(&space->latch); } |