[Commits] Rev 3255: Fix .deb install failure when PBXT is not built-in. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jan 31 09:57:59 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3255
revision-id: knielsen at knielsen-hq.org-20120131075759-wy9ryk9ad204ydwd
parent: sanja at montyprogram.com-20120130151222-ny5v3kdcw9o3wrkg
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Tue 2012-01-31 08:57:59 +0100
message:
  Fix .deb install failure when PBXT is not built-in.
  Fix egrep syntax error in .deb preinst.
=== modified file 'debian/dist/Debian/mariadb-server-5.5.postinst'
--- a/debian/dist/Debian/mariadb-server-5.5.postinst	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.postinst	2012-01-31 07:57:59 +0000
@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.postinst'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.postinst	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.postinst	2012-01-31 07:57:59 +0000
@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

=== modified file 'debian/mariadb-server-5.5.preinst'
--- a/debian/mariadb-server-5.5.preinst	2012-01-23 11:20:16 +0000
+++ b/debian/mariadb-server-5.5.preinst	2012-01-31 07:57:59 +0000
@@ -49,7 +49,7 @@ stop_server() {
 this_version=5.5
 
 # Abort if an NDB cluster is in use.
-if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /etc/mysql/; then
+if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then
   db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
   db_input high mysql-server/no_upgrade_when_using_ndb || true
   db_go



More information about the commits mailing list