Merge 10.5 into 10.6

Author: dr-m

mysql-test/main/trigger-trans.result

@@ -234,11 +234,12 @@ DROP TABLE t3, t2, t1;
 # void MDL_context::release_lock(MDL_ticket*)
 #
 CREATE TABLE t1 (id int(11)) ENGINE=InnoDB;
-SET max_statement_time= 0.001;
 LOCK TABLES t1 WRITE;
+SET max_statement_time= 0.001;
 CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1);
-DROP TABLE t1;
 SET max_statement_time= default;
+DROP TRIGGER IF EXISTS trg16;
+DROP TABLE t1;
 #
 # End of 10.5 tests
 #

mysql-test/main/trigger-trans.test

@@ -240,11 +240,17 @@ DROP TABLE t3, t2, t1;
 --echo #
 
 CREATE TABLE t1 (id int(11)) ENGINE=InnoDB;
-SET max_statement_time= 0.001;
 LOCK TABLES t1 WRITE;
+SET max_statement_time= 0.001;
+--error 0,1969,2013
+--disable_warnings
 CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1);
-DROP TABLE t1;
+--enable_warnings
 SET max_statement_time= default;
+--disable_warnings
+DROP TRIGGER IF EXISTS trg16;
+--enable_warnings
+DROP TABLE t1;
 
 --echo #
 --echo # End of 10.5 tests

sql/sql_admin.cc

@@ -605,6 +605,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
 
  if (thd->check_killed())
  {
+ open_error= false;
  fatal_error= true;
  result_code= HA_ADMIN_FAILED;
  goto send_result;

storage/innobase/buf/buf0buf.cc

@@ -824,7 +824,7 @@ buf_madvise_do_dump()
 ret+= madvise(chunk->mem, chunk->mem_size(), MADV_DODUMP);
 }
 
-mysql_mutex_lock(&buf_pool.mutex);
+mysql_mutex_unlock(&buf_pool.mutex);
 return ret;
 }
 #endif