summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-05-13 13:04:01 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-05-13 13:04:01 +0200
commit067fa4a5c6203247163130b079238ac4b648a022 (patch)
treec1c060f0c33641baf8812d14ba71f8ddb70f2f0c
parent280dce482bb2f1c421700331394d53a75c74b39d (diff)
parentf66763a3ef66b852c28b01d5ebdd5282b8a85398 (diff)
downloadmariadb-git-067fa4a5c6203247163130b079238ac4b648a022.tar.gz
merge from 5.1-mtr
-rw-r--r--mysql-test/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index f3b4343f9a0..aa4c8bad141 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -80,7 +80,6 @@ TEST_DIRS = t r include std_data std_data/parts collections \
std_data/funcs_1 \
extra/binlog_tests/ extra/rpl_tests \
suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
- suite/bugs suite/bugs/data suite/bugs/t suite/bugs/r \
suite/federated \
suite/funcs_1 suite/funcs_1/bitdata \
suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \