1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin 2020-08-03 13:04:32 +02:00
commit 555c6632c6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_admin.cc
View File

@ -776,7 +776,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
*/ */
collect_eis= collect_eis=
(table->table->s->table_category == TABLE_CATEGORY_USER && (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 || (get_use_stat_tables_mode(thd) > NEVER ||
lex->with_persistent_for_clause)); lex->with_persistent_for_clause));
} }

3
storage/xtradb/mtr/mtr0mtr.cc
View File

@ -93,8 +93,7 @@ mtr_memo_slot_release_func(
{ {
fil_space_t* space = reinterpret_cast<fil_space_t*>( fil_space_t* space = reinterpret_cast<fil_space_t*>(
static_cast<char*>(object) static_cast<char*>(object)
- reinterpret_cast<char*>( - my_offsetof(fil_space_t, latch));
&static_cast<fil_space_t*>(0)->latch));
space->committed_size = space->size; space->committed_size = space->size;
rw_lock_x_unlock(&space->latch); rw_lock_x_unlock(&space->latch);
} }