Merge mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-5.0


mysql-test/Makefile.am:
  Auto merged

mysql-test/Makefile.am

@@ -35,7 +35,8 @@ testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp
 EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
 test_SCRIPTS = 		mysql-test-run install_test_db 
-test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
+test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
+	std_data/server-cert.pem std_data/server-key.pem 
 CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)
 
 INCLUDES =		-I$(srcdir)/../include -I../include -I..