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

[Christian Hammers]

Author: ch
Date: 2007-08-28 21:42:48 +0000 (Tue, 28 Aug 2007)
New Revision: 920

Modified:
   branches/sid-5.1/debian/mysql-server-5.1.postinst
Log:
changed according to mysql_fix_privileges


Modified: branches/sid-5.1/debian/mysql-server-5.1.postinst
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.postinst	2007-08-28 21:42:29 UTC (rev 919)
+++ branches/sid-5.1/debian/mysql-server-5.1.postinst	2007-08-28 21:42:48 UTC (rev 920)
@@ -154,7 +154,7 @@
     MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --skip-innodb "
     password_column_fix_query=`/bin/echo -e \
 	"USE mysql\n" \
-	"ALTER TABLE user CHANGE password Password varchar(41) collate utf8_bin NOT NULL default ''"`;
+        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
     replace_query=`/bin/echo -e \
 	"USE mysql\n" \
 	"REPLACE INTO user SET " \
@@ -180,13 +180,13 @@
         ", Trigger_priv='Y' " `;
       fix_privs=`/bin/echo -e \
         "USE mysql;\n" \
-        "ALTER TABLE user ADD column Create_view_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Show_view_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Create_routine_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Alter_routine_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Create_user_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Event_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " \
-        "ALTER TABLE user ADD column Trigger_priv enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N'; " `
+        "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Show_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Create_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Alter_routine_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
+        "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
 
     echo "$password_column_fix_query"                             | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
     echo "$fix_privs" 						  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER