Merge work.mysql.com:/home/bk/mysql

into cane.mysql.fi:/usr/home/tim/my/work

mysql-test/Makefile.am

@@ -62,6 +62,7 @@ SUFFIXES = .sh
 	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
 	  -e 's!@''PERL''@!@PERL@!' \
 	  -e 's!@''VERSION''@!@VERSION@!' \
+	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 	  $< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@