diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-24 14:52:43 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-24 14:52:43 +0100 |
| commit | 3b85e2b57cc13c59a0afc0cd2c3d48379e275760 (patch) | |
| tree | ef6370ccc7064a98b19bf462217c834fa8a5ecd3 | |
| parent | 92bd8a5c6023927c64a110b6137a5cfa0659a01c (diff) | |
| download | mariadb-git-3b85e2b57cc13c59a0afc0cd2c3d48379e275760.tar.gz | |
More 5.5 .deb packaging fixes
| -rwxr-xr-x | debian/dist/Debian/rules | 3 | ||||
| -rwxr-xr-x | debian/dist/Ubuntu/rules | 3 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 11347164ea0..9994502ae1c 100755 --- a/debian/dist/Debian/rules +++ b/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 \ diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index 564dad01ac0..99d0e49adc3 100755 --- a/debian/dist/Ubuntu/rules +++ b/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 \ diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 3c8d3059713..3c91429f90c 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/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 |