summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2023-02-15 19:26:32 +0300
committerNikita Malyavin <nikitamalyavin@gmail.com>2023-05-05 15:59:20 +0300
commit25d93b82914fdcd06ae17c9b295dc33963a0a532 (patch)
treee9e4fe0f721260cc6ab76aa68ec43d0d32515fdc
parent5343d32170e806f8d4384aa419d8cc3d20f1c02a (diff)
downloadmariadb-git-25d93b82914fdcd06ae17c9b295dc33963a0a532.tar.gz
fix main.query_cache_innodb and main.alter_table_{online,lock}
-rw-r--r--mysql-test/main/alter_table_lock.test1
-rw-r--r--mysql-test/main/alter_table_online.test1
-rw-r--r--mysql-test/main/query_cache_innodb.result2
3 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/alter_table_lock.test b/mysql-test/main/alter_table_lock.test
index 6fe717f977e..1ed267e56d1 100644
--- a/mysql-test/main/alter_table_lock.test
+++ b/mysql-test/main/alter_table_lock.test
@@ -1,4 +1,5 @@
--source include/not_msan.inc
+--source include/not_embedded.inc
--source include/have_innodb.inc
--echo #
diff --git a/mysql-test/main/alter_table_online.test b/mysql-test/main/alter_table_online.test
index 03cd78084fd..224e506ef88 100644
--- a/mysql-test/main/alter_table_online.test
+++ b/mysql-test/main/alter_table_online.test
@@ -1,5 +1,6 @@
--source include/binlog_combinations.inc
--source include/have_innodb.inc
+--source include/not_embedded.inc
--echo #
--echo # alter ignore cannot be done online
diff --git a/mysql-test/main/query_cache_innodb.result b/mysql-test/main/query_cache_innodb.result
index 62424ac362b..e5569c53d5f 100644
--- a/mysql-test/main/query_cache_innodb.result
+++ b/mysql-test/main/query_cache_innodb.result
@@ -85,7 +85,7 @@ t2id id
use test;
drop database `#mysql50#-`;
SET NAMES default;
-FOUND 8 /\[ERROR\] Invalid \(old\?\) table or database name/ in mysqld.1.err
+FOUND 10 /\[ERROR\] Invalid \(old\?\) table or database name/ in mysqld.1.err
set global query_cache_type=DEFAULT;
set global query_cache_size=@save_query_cache_size;
End of 10.2 tests