More 5.5 .deb packaging fixes

debian/dist/Debian/rules

@@ -78,7 +78,7 @@ endif
 			-DINSTALL_MANDIR=share/man \
 		\
 		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-		-DWITH_COMMENT="(MariaDB - http://mariadb.com/)" \
+		-DCOMPILATION_COMMENT="mariadb.org binary distribution" \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
 		-DINSTALL_LAYOUT=DEB \
 		\
@@ -86,7 +86,6 @@ endif
 		-DWITH_FAST_MUTEXES=1 \
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DMYSQL_USER=mysql \
 		\
 		-DEXTRA_CHARSETS=all \
 		-DWITH_LIBWRAP=1 \

debian/dist/Ubuntu/rules

@@ -78,7 +78,7 @@ endif
 			-DINSTALL_MANDIR=share/man \
 		\
 		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-		-DWITH_COMMENT="(MariaDB - http://mariadb.com/)" \
+		-DCOMPILATION_COMMENT="mariadb.org binary distribution" \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
 		-DINSTALL_LAYOUT=DEB \
 		\
@@ -86,7 +86,6 @@ endif
 		-DWITH_FAST_MUTEXES=1 \
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DMYSQL_USER=mysql \
 		\
 		-DEXTRA_CHARSETS=all \
 		-DWITH_LIBWRAP=1 \

mysql-test/lib/mtr_cases.pm

@@ -278,6 +278,7 @@ sub collect_one_suite
     {
       $suitedir= my_find_dir($::basedir,
 			     ["share/mysql-test/suite",
+			      "share/mysql/mysql-test/suite",
 			      "mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs