summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 17:18:04 +0300
committerMonty <monty@mariadb.org>2019-09-02 17:18:04 +0300
commit0d6635822094a424f19e753aa24a8424d449dd6a (patch)
treebcd5c07fa2bc75486f06b77e1c6d204f5490c602
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-0d6635822094a424f19e753aa24a8424d449dd6a.tar.gz
Disabled test in 32bit that uses too much memory or cpu
-rw-r--r--mysql-test/suite/binlog/t/flashback-largebinlog.test2
-rw-r--r--mysql-test/suite/innodb_fts/t/fulltext_table_evict.test1
-rw-r--r--mysql-test/suite/innodb_gis/t/update_root.test2
-rw-r--r--mysql-test/t/ssl-big.test1
4 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/t/flashback-largebinlog.test b/mysql-test/suite/binlog/t/flashback-largebinlog.test
index 7ee89f43580..fb2703dfac5 100644
--- a/mysql-test/suite/binlog/t/flashback-largebinlog.test
+++ b/mysql-test/suite/binlog/t/flashback-largebinlog.test
@@ -15,6 +15,8 @@
# This is a big test.
--source include/big_test.inc
+# Test needs more than 4G of memory
+--source include/have_64bit.inc
--echo #
--echo # Preparatory cleanup.
diff --git a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
index 2e7aa655aa1..eaf50856c55 100644
--- a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
+++ b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
@@ -1,6 +1,7 @@
--source include/have_innodb.inc
--source include/have_debug.inc
--source include/big_test.inc
+--source include/have_64bit.inc
--echo #
--echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
diff --git a/mysql-test/suite/innodb_gis/t/update_root.test b/mysql-test/suite/innodb_gis/t/update_root.test
index 395fc715f31..c6d3ba60650 100644
--- a/mysql-test/suite/innodb_gis/t/update_root.test
+++ b/mysql-test/suite/innodb_gis/t/update_root.test
@@ -8,6 +8,8 @@
--source include/have_debug.inc
--source include/big_test.inc
--source include/not_valgrind.inc
+--source include/have_64bit.inc
+
# Create table with R-tree index.
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
diff --git a/mysql-test/t/ssl-big.test b/mysql-test/t/ssl-big.test
index 59825a148a4..367cbcba2d7 100644
--- a/mysql-test/t/ssl-big.test
+++ b/mysql-test/t/ssl-big.test
@@ -3,6 +3,7 @@
-- source include/have_ssl_communication.inc
-- source include/big_test.inc
+-- source include/have_64bit.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc