From e66c574df9fb554880217dcbf3a2fbf7e88e1d98 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Tue, 9 Jun 2009 11:36:14 -0300
Subject: [PATCH] Don't run funcs_1/myisam_views test case under valgrind,
 unless the --big-test flag is supplied. Test is too resource intensive under
 normal valgrind runs (takes more than 30min on powerful hardware).

mysql-test/include/no_valgrind_without_big.inc:
  Add MTR prerequisite file by Matthias Leich.
mysql-test/suite/funcs_1/t/myisam_views.test:
  Test is too resource intensive under "Valgrind".
---
 mysql-test/include/no_valgrind_without_big.inc | 12 ++++++++++++
 mysql-test/suite/funcs_1/t/myisam_views.test   |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 mysql-test/include/no_valgrind_without_big.inc

diff --git a/mysql-test/include/no_valgrind_without_big.inc b/mysql-test/include/no_valgrind_without_big.inc
new file mode 100644
index 00000000000..743e974daec
--- /dev/null
+++ b/mysql-test/include/no_valgrind_without_big.inc
@@ -0,0 +1,12 @@
+# include/no_valgrind_without_big.inc
+#
+# If we are running with Valgrind ($VALGRIND_TEST <> 0) than the resource
+# consumption (storage space needed, runtime ...) will be extreme.
+# Therefore we require that the option "--big-test" is also set.
+#
+
+if (`SELECT $VALGRIND_TEST <> 0 AND '$BIG_TEST' = ''`)
+{
+   --skip Need "--big-test" when running with Valgrind
+}
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_views.test b/mysql-test/suite/funcs_1/t/myisam_views.test
index 461bc0e3549..fe72843cfaf 100644
--- a/mysql-test/suite/funcs_1/t/myisam_views.test
+++ b/mysql-test/suite/funcs_1/t/myisam_views.test
@@ -1,5 +1,7 @@
 #### suite/funcs_1/t/myisam_views.test
 
+--source include/no_valgrind_without_big.inc
+
 # MyISAM tables should be used
 #
 # Set $engine_type