[Pkg-mysql-commits] r1564 - mysql-dfsg-5.1/branches/experimental/debian
Norbert Tretkowski
nobse at alioth.debian.org
Tue Apr 7 11:31:23 UTC 2009
Author: nobse
Date: 2009-04-07 11:31:23 +0000 (Tue, 07 Apr 2009)
New Revision: 1564
Modified:
mysql-dfsg-5.1/branches/experimental/debian/changelog
mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst
Log:
Remove old upgrade stuff.
Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog 2009-04-07 11:15:34 UTC (rev 1563)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog 2009-04-07 11:31:23 UTC (rev 1564)
@@ -1,6 +1,7 @@
mysql-dfsg-5.1 (5.1.33-2) UNRELEASED; urgency=low
* Remove no longer active developers from uploaders field.
+ * Drop workarounds for upgrades from MySQL 3.23, not necessary any more.
-- 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 11:15:34 UTC (rev 1563)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.postinst 2009-04-07 11:31:23 UTC (rev 1564)
@@ -197,22 +197,11 @@
" Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
" Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \
" Process_priv='Y', File_priv='Y', Grant_priv='Y', References_priv='Y', " \
- " Index_priv='Y', Alter_priv='Y' __EXTRA_PRIVS__"`;
- extra_privs=`/bin/echo -e \
- ", Show_db_priv='Y' " \
- ", Super_priv='Y' " \
- ", Create_tmp_table_priv='Y' " \
- ", Lock_tables_priv='Y' " \
- ", Execute_priv='Y' " \
- ", Repl_slave_priv='Y' " \
- ", Repl_client_priv='Y' " \
- ", Create_view_priv='Y' " \
- ", Show_view_priv='Y' " \
- ", Create_routine_priv='Y' " \
- ", Alter_routine_priv='Y' " \
- ", Create_user_priv='Y' " \
- ", Event_priv='Y' " \
- ", Trigger_priv='Y' " `;
+ " Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\
+ " Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
+ " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
+ " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y' "\
+ " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
fix_privs=`/bin/echo -e \
"USE mysql;\n" \
"ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
@@ -236,18 +225,17 @@
"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
+ echo "$fix_privs" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+ echo "$replace_query" | $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
+ echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
set -e
;;
More information about the Pkg-mysql-commits
mailing list