[Pkg-mysql-commits] r941 - branches/sid-5.1/debian

[Christian Hammers]

Author: ch
Date: 2007-10-03 11:23:18 +0000 (Wed, 03 Oct 2007)
New Revision: 941

Modified:
   branches/sid-5.1/debian/mysql-server-5.1.postinst
Log:
Newlines seems to be necessary with mysqld --bootstrap


Modified: branches/sid-5.1/debian/mysql-server-5.1.postinst
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.postinst	2007-10-03 11:23:00 UTC (rev 940)
+++ branches/sid-5.1/debian/mysql-server-5.1.postinst	2007-10-03 11:23:18 UTC (rev 941)
@@ -224,16 +224,16 @@
         "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
-    # admin might already have chosen to remove one or more plugins.
+    # admin might already have chosen to remove one or more plugins. Newlines are necessary.
     install_plugins=`/bin/echo -e \
 	"USE mysql;\n" \
-	"CREATE TABLE 'plugin' ('name' char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-	"  'dl' char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-	"  PRIMARY KEY ('name')) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins'; " \
-	"INSERT INTO plugin VALUES ('innodb',    'ha_innodb.so'); " \
-	"INSERT INTO plugin VALUES ('federated', 'ha_federated.so'); " \
-	"INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so'); " \
-	"INSERT INTO plugin VALUES ('archive',   'ha_archive.so'); " `
+	"CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+	"  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+	"  PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \
+	"INSERT INTO plugin VALUES ('innodb',    'ha_innodb.so');\n" \
+	"INSERT INTO plugin VALUES ('federated', 'ha_federated.so');\n" \
+	"INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so');\n" \
+	"INSERT INTO plugin VALUES ('archive',   'ha_archive.so');" `
 
     # Upgrade password column format before the root password gets set.
     echo "$password_column_fix_query"                             | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
@@ -248,6 +248,7 @@
     set +e
     echo "$replace_query" | sed "s/__EXTRA_PRIVS__/$extra_privs/" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
     echo "$install_plugins"                                       | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    echo "$install_plugins"                                       | $ERR_LOGGER
     set -e
   ;;