summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-06-08 12:51:06 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-06-08 12:51:06 -0300
commita7c2707740054204e52f4665c4d81159272d40b7 (patch)
tree4eca055bf9371e76bd1db64b3dacc0cd99902818
parent55eee5208cfc59e801a28487acb2dbf9881d0d57 (diff)
downloadmariadb-git-a7c2707740054204e52f4665c4d81159272d40b7.tar.gz
Test is very resource intensive under debug and valgrind runs.
Under a debug run, the trace file grows to a few gigabytes. Under valgrind, takes more then 20 minutes due to the high number of insert statements. mysql-test/t/multi_update2.test: Skip under --valgrind and --debug.
-rw-r--r--mysql-test/t/multi_update2.test19
1 files changed, 16 insertions, 3 deletions
diff --git a/mysql-test/t/multi_update2.test b/mysql-test/t/multi_update2.test
index 47f9bc7bad7..9341d40282b 100644
--- a/mysql-test/t/multi_update2.test
+++ b/mysql-test/t/multi_update2.test
@@ -2,14 +2,27 @@
# Test of update statement that uses many tables.
#
---disable_warnings
-DROP TABLE IF EXISTS t1,t2;
---enable_warnings
+#
+# If we are running with
+# - Valgrind -> $VALGRIND_TEST <> 0
+# - debug tracing -> @@debug LIKE '%trace%'
+# the resource consumtion (storage space needed, runtime) will be extreme.
+# Therefore we require that option "big" is set.
+#
+
+if (`SELECT ($VALGRIND_TEST <> 0 OR @@debug LIKE '%trace%') AND '$BIG_TEST' = ''`)
+{
+ --skip Need "big" when running with Valgrind or debug
+}
#
# Bug#1820 Rows not deleted from second table on multi-table delete
#
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2;
+--enable_warnings
+
CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL) ;
--echo # The protocolling of many inserts into t1 is suppressed.
--disable_query_log