merge 5.1-bugteam --> 5.1-bugteam (local)

mysql-test/Makefile.am

@@ -78,6 +78,7 @@ EXTRA_DIST =	README \
 TEST_DIRS = t r include std_data std_data/parts \
 	std_data/ndb_backup50 std_data/ndb_backup51 \
 	std_data/ndb_backup51_data_be std_data/ndb_backup51_data_le \
+	std_data/funcs_1 \
 	extra/binlog_tests/ extra/rpl_tests \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
 	suite/bugs/data suite/bugs/t suite/bugs/r \