summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-03-01 16:53:09 +0100
committerSergei Golubchik <serg@mariadb.org>2021-03-01 16:53:50 +0100
commit1f1f61a9de0c85ed5fbe186b3c025a4ace002a8b (patch)
treed03e21956fa725434fff470d345ae9d27951318d
parent6976bb94b4b8247f450418dea6cb9aca97e3554f (diff)
downloadmariadb-git-1f1f61a9de0c85ed5fbe186b3c025a4ace002a8b.tar.gz
MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
disable warnings, as they're different on 32bit platforms Closes #1757
-rw-r--r--mysql-test/main/query_cache.result2
-rw-r--r--mysql-test/main/query_cache.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/query_cache.result b/mysql-test/main/query_cache.result
index 43a0ac5f522..bff04de6520 100644
--- a/mysql-test/main/query_cache.result
+++ b/mysql-test/main/query_cache.result
@@ -2211,8 +2211,6 @@ drop table t1;
# MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
#
set global Query_cache_size=18446744073709547520;
-Warnings:
-Warning 1282 Query cache failed to set size 18446744073709547520; new query cache size is 0
restore defaults
SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_size=@save_query_cache_size;
diff --git a/mysql-test/main/query_cache.test b/mysql-test/main/query_cache.test
index 188861cd3d9..4d769b46213 100644
--- a/mysql-test/main/query_cache.test
+++ b/mysql-test/main/query_cache.test
@@ -1803,7 +1803,9 @@ drop table t1;
--echo #
--echo # MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
--echo #
+--disable_warnings
set global Query_cache_size=18446744073709547520;
+--enable_warnings
--echo restore defaults
SET GLOBAL query_cache_type= default;