MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 28 2009 8:08pm
Subject:bzr push into mysql-5.1-bugteam branch (davi:3043 to 3044)
View as plain text  
 3044 Davi Arnaut	2009-07-28
      If running the mysql_upgrade test case with Valgrind, the resource
      consumption (CPU) for upgrading a large log table can be intense.
      Therefore, truncate the general_log table beforehand if running
      mysql_upgrade test with Valgrind.
     @ mysql-test/t/mysql_upgrade.test
        Truncate log table if running with Valgrind.

    modified:
      mysql-test/t/mysql_upgrade.test
 3043 Alexey Kopytov	2009-07-28 [merge]
      Automerge.

=== modified file 'mysql-test/t/mysql_upgrade.test'
--- a/mysql-test/t/mysql_upgrade.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/t/mysql_upgrade.test	2009-07-28 19:59:38 +0000
@@ -8,6 +8,26 @@ select LENGTH("$MYSQL_UPGRADE")>0 as hav
 --enable_query_log
 
 #
+# Hack:
+#
+# If running with Valgrind ($VALGRIND_TEST <> 0) then the resource
+# consumption (CPU) for upgrading a large log table will be intense.
+# Therefore, truncate the log table in advance and issue a statement
+# that should be logged.
+#
+if (`SELECT $VALGRIND_TEST`)
+{
+  --disable_query_log
+  --disable_result_log
+  --disable_abort_on_error
+  TRUNCATE TABLE mysql.general_log;
+  SELECT 1;
+  --enable_abort_on_error
+  --enable_result_log
+  --enable_query_log
+}
+
+#
 # Basic test that we can run mysql_upgrde and that it finds the
 # expected binaries it uses.
 #


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20090728195938-qabe9ldm2l4k8xns.bundle
Thread
bzr push into mysql-5.1-bugteam branch (davi:3043 to 3044)Davi Arnaut28 Jul