[Pkg-mysql-commits] r1559 - mysql-dfsg-5.1/branches/experimental/debian

[Norbert Tretkowski]

Author: nobse
Date: 2009-04-07 10:13:37 +0000 (Tue, 07 Apr 2009)
New Revision: 1559

Modified:
   mysql-dfsg-5.1/branches/experimental/debian/changelog
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst
Log:
Use mysql_fix_privilege_tables.sql to fix privilege tables.

Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-04-07 09:29:00 UTC (rev 1558)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-04-07 10:13:37 UTC (rev 1559)
@@ -1,6 +1,7 @@
 mysql-dfsg-5.1 (5.1.33-2) UNRELEASED; urgency=low
 
   * Upload to unstable.
+  * Use mysql_fix_privilege_tables.sql to fix privilege tables.
 
  -- Norbert Tretkowski <nobse at debian.org>  Tue, 07 Apr 2009 11:23:25 +0200
 

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst	2009-04-07 09:29:00 UTC (rev 1558)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst	2009-04-07 10:13:37 UTC (rev 1559)
@@ -236,19 +236,22 @@
 	"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
+    #echo "$password_column_fix_query"                             | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
 
     db_get mysql-server/root_password && rootpw="$RET"
     if ! set_mysql_rootpw; then
         password_error="yes"
     fi
 
-    echo "$fix_privs" 						  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    echo "$replace_query" | sed "s/__EXTRA_PRIVS__//"             | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    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
-    set -e
+    #echo "$fix_privs" 						  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    #echo "$replace_query" | sed "s/__EXTRA_PRIVS__//"             | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+    #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
+    #set -e
+
+    echo "use mysql; `cat /usr/share/mysql/mysql_fix_privilege_tables.sql`" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+
   ;;
 
   abort-upgrade|abort-remove|abort-configure)