database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-28 10:55:40 +02:00
parent c61345169a 31c06951c6
commit 7335e9b8ef
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/innodb_fts/r/innodb_ft_aux_table.result
View File

@@ -118,4 +118,13 @@ KEY VALUE
SELECT @@GLOBAL.innodb_ft_aux_table; SELECT @@GLOBAL.innodb_ft_aux_table;
@@GLOBAL.innodb_ft_aux_table @@GLOBAL.innodb_ft_aux_table
test/t1 test/t1
CREATE TABLE t(a INT) ENGINE=InnoDB;
SET GLOBAL innodb_ft_aux_table='test/t';
ERROR 42000: Variable 'innodb_ft_aux_table' can't be set to the value of 'test/t'
DROP TABLE t;
SET GLOBAL innodb_ft_aux_table='test/t';
ERROR 42000: Variable 'innodb_ft_aux_table' can't be set to the value of 'test/t'
SELECT @@GLOBAL.innodb_ft_aux_table;
@@GLOBAL.innodb_ft_aux_table
test/t1
SET GLOBAL innodb_ft_aux_table = @save_ft_aux_table; SET GLOBAL innodb_ft_aux_table = @save_ft_aux_table;

9
mysql-test/suite/innodb_fts/t/innodb_ft_aux_table.test
View File

@@ -41,4 +41,13 @@ SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE; SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_CONFIG; SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_CONFIG;
SELECT @@GLOBAL.innodb_ft_aux_table; SELECT @@GLOBAL.innodb_ft_aux_table;
CREATE TABLE t(a INT) ENGINE=InnoDB;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL innodb_ft_aux_table='test/t';
DROP TABLE t;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL innodb_ft_aux_table='test/t';
SELECT @@GLOBAL.innodb_ft_aux_table;
SET GLOBAL innodb_ft_aux_table = @save_ft_aux_table; SET GLOBAL innodb_ft_aux_table = @save_ft_aux_table;

8
storage/innobase/buf/buf0flu.cc
View File

@@ -2002,6 +2002,14 @@ static bool log_checkpoint() noexcept
if (recv_recovery_is_on()) if (recv_recovery_is_on())
recv_sys.apply(true); recv_sys.apply(true);
#if defined HAVE_valgrind && !__has_feature(memory_sanitizer)
/* The built-in scheduler in Valgrind may neglect some threads for a
long time. Under Valgrind, let us explicitly wait for page write
completion in order to avoid a result difference in the test
innodb.page_cleaner. */
os_aio_wait_until_no_pending_writes(false);
#endif
switch (srv_file_flush_method) { switch (srv_file_flush_method) {
case SRV_NOSYNC: case SRV_NOSYNC:
case SRV_O_DIRECT_NO_FSYNC: case SRV_O_DIRECT_NO_FSYNC:

3
storage/innobase/handler/ha_innodb.cc
View File

@@ -17608,8 +17608,9 @@ static int innodb_ft_aux_table_validate(THD *thd, st_mysql_sys_var*,
*static_cast<const char**>(save) = table_name; *static_cast<const char**>(save) = table_name;
return 0; return 0;
} }
} else {
dict_sys.unlock();
} }
dict_sys.unlock();
return 1; return 1;
} else { } else {
*static_cast<char**>(save) = NULL; *static_cast<char**>(save) = NULL;