mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2021-06-02 11:31:01 +03:00
commit 06dd151bb8
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/main/trigger-trans.result
View file

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

10
mysql-test/main/trigger-trans.test
View file

@ -240,11 +240,17 @@ DROP TABLE t3, t2, t1;
--echo # --echo #
CREATE TABLE t1 (id int(11)) ENGINE=InnoDB; CREATE TABLE t1 (id int(11)) ENGINE=InnoDB;
SET max_statement_time= 0.001;
LOCK TABLES t1 WRITE; 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); 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; SET max_statement_time= default;
--disable_warnings
DROP TRIGGER IF EXISTS trg16;
--enable_warnings
DROP TABLE t1;
--echo # --echo #
--echo # End of 10.5 tests --echo # End of 10.5 tests

1
sql/sql_admin.cc
View file

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

2
storage/innobase/buf/buf0buf.cc
View file

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