Merge branch '10.1' into 10.2

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

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