mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35417 InnoDB crashes under ... AND DISABLE CHECKPOINT

Browse source 
restore pre-11.7 behavior when InnoDB was ignoring the
"AND DISABLE CHECKPOINT" clause of FTWGRL.

InnoDB isn't ready for it yet
This commit is contained in:
Sergei Golubchik 2024-12-29 17:54:52 +01:00
parent 8de5b58627
commit 61806af658
3 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mysql-test/main/flush_read_lock.result
View file

@ -1854,3 +1854,24 @@ connection con2;
disconnect con2; disconnect con2;
connection default; connection default;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
# End of 10.4 tests
#
# MDEV-35417 InnoDB crashes under ... AND DISABLE CHECKPOINT
#
set global innodb_stats_persistent=0;
create table t (a int) engine=innodb;
set global innodb_stats_persistent=1;
alter table t add column b int;
flush tables with read lock and disable checkpoint;
insert into t values (1,2) ;
ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
drop table t;
flush tables with read lock and disable checkpoint;
create temporary table t(a int) engine=innodb;
unlock tables;
drop table t;
# restart: --innodb-read-only
flush tables with read lock and disable checkpoint;
# restart
# End of 11.7 tests

32
mysql-test/main/flush_read_lock.test
View file

@ -2269,3 +2269,35 @@ reap;
disconnect con2; disconnect con2;
connection default; connection default;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
--echo # End of 10.4 tests
--echo #
--echo # MDEV-35417 InnoDB crashes under ... AND DISABLE CHECKPOINT
--echo #
# case 1
set global innodb_stats_persistent=0;
create table t (a int) engine=innodb;
set global innodb_stats_persistent=1;
alter table t add column b int;
flush tables with read lock and disable checkpoint;
--error ER_CANT_UPDATE_WITH_READLOCK
insert into t values (1,2) ;
unlock tables;
drop table t;
# case 2
flush tables with read lock and disable checkpoint;
create temporary table t(a int) engine=innodb;
unlock tables;
drop table t;
# case 3
--let $restart_parameters=--innodb-read-only
--source include/restart_mysqld.inc
flush tables with read lock and disable checkpoint;
--let $restart_parameters=
--source include/restart_mysqld.inc
--echo # End of 11.7 tests

6
storage/innobase/handler/ha_innodb.cc
View file

@ -1889,6 +1889,12 @@ static void sst_enable_innodb_writes()
static void innodb_disable_internal_writes(bool disable) static void innodb_disable_internal_writes(bool disable)
{ {
/*
this works only in the SST donor thread and is not yet fixed
to work in a normal connection thread
*/
if (thd_get_thread_id(current_thd)) // if normal thread
return;
if (disable) if (disable)
sst_disable_innodb_writes(); sst_disable_innodb_writes();
else else