Merge branch '10.1' into 10.2

sanja-byelkin · sanja-byelkin · commit 555c6632c69d · 2020-08-03T13:04:32.000+02:00
diff --git 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
@@ -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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,`
`776`	`776`	`*/`
`777`	`777`	`collect_eis=`
`778`	`778`	`(table->table->s->table_category == TABLE_CATEGORY_USER &&`
`779`		`- !(lex->alter_info.flags &= Alter_info::ALTER_ADMIN_PARTITION) &&`
	`779`	`+ !(lex->alter_info.flags & Alter_info::ALTER_ADMIN_PARTITION) &&`
`780`	`780`	`(get_use_stat_tables_mode(thd) > NEVER \|\|`
`781`	`781`	`lex->with_persistent_for_clause));`
`782`	`782`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,7 @@ mtr_memo_slot_release_func(`
`93`	`93`	`{`
`94`	`94`	`fil_space_t* space = reinterpret_cast<fil_space_t*>(`
`95`	`95`	`static_cast<char*>(object)`
`96`		`- - reinterpret_cast<char*>(`
`97`		`- &static_cast<fil_space_t*>(0)->latch));`
	`96`	`+ - my_offsetof(fil_space_t, latch));`
`98`	`97`	`space->committed_size = space->size;`
`99`	`98`	`rw_lock_x_unlock(&space->latch);`
`100`	`99`	`}`