#At file:///home/vinayf/repo/branches/mysql-trunk/ based on revid:davi.arnaut@stripped
3209 Vinay Fisrekar 2011-06-16 [merge]
merge mysql-5.5 -> trunk , skip test with valgrind due to restart in test
modified:
mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
=== modified file 'mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test'
--- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test 2011-06-02 09:42:55 +0000
+++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test 2011-06-16 04:30:51 +0000
@@ -9,6 +9,8 @@
# #
######################################################################
+# Don't test this under valgrind, memory leaks will occur due restart
+--source include/not_valgrind.inc
# Test restart the server and "shutdown_server" looks for pid file
# which is not there with embedded mode
--source include/not_embedded.inc
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into mysql-trunk branch (vinay.fisrekar:3209) | Vinay Fisrekar | 16 Jun |
