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.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2021-04-08 08:15:11 +03:00
commit b4f09aa268
3 changed files with 102 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
mysql-test/main/backup_lock_binlog.result Normal file
View file

@ -0,0 +1,40 @@
#
# MDEV-25334 FTWRL/Backup blocks DDL on temporary tables with binlog
# enabled assertion fails in Diagnostics_area::set_error_status
#
select @@binlog_format;
@@binlog_format
MIXED
connect con1,localhost,root,,;
connection default;
#
# Test 1
#
CREATE TEMPORARY TABLE tmp (a INT);
connection con1;
FLUSH TABLES WITH READ LOCK;
connection default;
SET lock_wait_timeout= 1;
ALTER TABLE tmp;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
connection con1;
unlock tables;
connection default;
drop table tmp;
#
# Test 2 (In statement format to ensure temporary table gets logged)
#
set @@binlog_format=statement;
CREATE TEMPORARY TABLE tmp (a INT);
connection con1;
BACKUP STAGE START;
BACKUP STAGE BLOCK_COMMIT;
connection default;
SET lock_wait_timeout= 1;
ALTER TABLE tmp;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
connection con1;
BACKUP STAGE end;
connection default;
drop table tmp;
disconnect con1;

49
mysql-test/main/backup_lock_binlog.test Normal file
View file

@ -0,0 +1,49 @@
--source include/have_binlog_format_mixed_or_statement.inc
#
# Tests involving locks and binlog
#
--echo #
--echo # MDEV-25334 FTWRL/Backup blocks DDL on temporary tables with binlog
--echo # enabled assertion fails in Diagnostics_area::set_error_status
--echo #
select @@binlog_format;
--connect (con1,localhost,root,,)
connection default;
--echo #
--echo # Test 1
--echo #
CREATE TEMPORARY TABLE tmp (a INT);
--connection con1
FLUSH TABLES WITH READ LOCK;
--connection default
SET lock_wait_timeout= 1;
--error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE tmp;
--connection con1
unlock tables;
--connection default
drop table tmp;
--echo #
--echo # Test 2 (In statement format to ensure temporary table gets logged)
--echo #
set @@binlog_format=statement;
CREATE TEMPORARY TABLE tmp (a INT);
--connection con1
BACKUP STAGE START;
BACKUP STAGE BLOCK_COMMIT;
--connection default
SET lock_wait_timeout= 1;
--error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE tmp;
--connection con1
BACKUP STAGE end;
--connection default
drop table tmp;
--disconnect con1

14
sql/sql_table.cc
View file

@ -10084,7 +10084,8 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
If such table exists, there must be a corresponding TABLE_SHARE in
THD::all_temp_tables list.
*/
if (thd->find_tmp_table_share(alter_ctx.new_db.str, alter_ctx.new_name.str))
if (thd->find_tmp_table_share(alter_ctx.new_db.str,
alter_ctx.new_name.str))
{
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alter_ctx.new_alias.str);
DBUG_RETURN(true);
@ -10225,6 +10226,17 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
if (table->s->tmp_table == NO_TMP_TABLE)
mysql_audit_alter_table(thd, table_list);
else if (table_creation_was_logged && mysql_bin_log.is_open())
{
/* Protect against MDL error in binary logging */
MDL_request mdl_request;
DBUG_ASSERT(!mdl_ticket);
MDL_REQUEST_INIT(&mdl_request, MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT,
MDL_TRANSACTION);
if (thd->mdl_context.acquire_lock(&mdl_request,
thd->variables.lock_wait_timeout))
DBUG_RETURN(true);
}
THD_STAGE_INFO(thd, stage_setup);