[Pkg-mysql-commits] r1613 - in mysql-dfsg-5.1/branches/experimental/debian: . additions

Fri Jul 3 23:46:48 UTC 2009

Author: ch
Date: 2009-07-03 23:46:48 +0000 (Fri, 03 Jul 2009)
New Revision: 1613

Modified:
   mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
   mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf
   mysql-dfsg-5.1/branches/experimental/debian/changelog
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.templates
Log:
  * Removed the check for ISAM tables as the only supported upgrade path is
    from lenny's MySQL-5.0.
  * Also made the new NDB Cluster error a nice debconf popup.



Modified: mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
===================================================================

--- mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-03 23:17:36 UTC (rev 1612)
+++ mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-03 23:46:48 UTC (rev 1613)
@@ -4,10 +4,11 @@
 ###########################
 
 # http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
-* Debconf template translations need testing
 * Append --syslog to /etc/mysql/*
 * call the REPAIR TABLE statement for each table that contains any FULLTEXT  indexes.
-* put this trigger-recreation thing into the init scripts
+* put this trigger-recreation thing into the init scripts -- what?!
+* Let debian-i10n-english review all template changes before the translaters start.
+* Mark debconf translations as obsolete with debconf-updatepo.
 
 ###########################################################################
 # Here are some information that are only of interest for the current and #

Modified: mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf	2009-07-03 23:17:36 UTC (rev 1612)
+++ mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf	2009-07-03 23:46:48 UTC (rev 1613)
@@ -121,18 +121,6 @@
 key_buffer		= 16M
 
 #
-# * NDB Cluster
-#
-# See /usr/share/doc/mysql-server-*/README.Debian for more information.
-#
-# The following configuration is read by the NDB Data Nodes (ndbd processes)
-# not from the NDB Management Nodes (ndb_mgmd processes).
-#
-# [MYSQL_CLUSTER]
-# ndb-connectstring=127.0.0.1
-
-
-#
 # * IMPORTANT: Additional settings that can override those from this file!
 #   The files must end with '.cnf', otherwise they'll be ignored.
 #

Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 23:17:36 UTC (rev 1612)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 23:46:48 UTC (rev 1613)
@@ -10,6 +10,8 @@
   * Applied Ubuntu patch that sets the debconf prio for the root password
     question to high and prevents it from being asked on 5.0 -> 5.1 upgrades
     (thanks to Mathias Gug). Closes: #535500
+  * Removed the check for ISAM tables as the only supported upgrade path is
+    from lenny's MySQL-5.0.
 
  -- Christian Hammers <ch at debian.org>  Wed, 01 Jul 2009 20:54:58 +0200
 

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst	2009-07-03 23:17:36 UTC (rev 1612)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst	2009-07-03 23:46:48 UTC (rev 1613)
@@ -55,22 +55,15 @@
   exit 1
 fi
 
-# Abort if old ISAM tables are present.
-if [ -n "`find /var/lib/mysql -name '*.ISM' 2>/dev/null`" ]; then
-  db_fset mysql-server-$this_version/no_upgrade_with_isam_tables seen false || true
-  db_input high mysql-server-$this_version/no_upgrade_with_isam_tables || true
+# Abort if an NDB cluster is in use.
+if egrep -q -r '^[^#]*ndb.connectstring' /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
   db_stop
   exit 1
 fi
 
-# Abort if an NDB cluster is in use.
-if egrep -q -r '^[^#]*ndb.connectstring' /etc/mysql/; then
-  /bin/echo -e "\nPROBLEM: MySQL-5.1 has orphaned NDB Cluster support.\n";
-  /bin/echo -e "Please remove all lines starting with ndb from my.cnf.\n";
-  exit 1
-fi
-
 # Safe the user from stupidities.
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.templates
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.templates	2009-07-03 23:17:36 UTC (rev 1612)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.templates	2009-07-03 23:46:48 UTC (rev 1613)
@@ -52,16 +52,6 @@
  The MySQL server can be launched automatically at boot time or manually
  with the '/etc/init.d/mysql start' command.
 
-Template: mysql-server-5.1/no_upgrade_with_isam_tables
-Type: note
-_Description: Cannot upgrade if ISAM tables are present!
- Recent versions of MySQL can no longer use the old ISAM table format and
- it is necessary to convert your tables to e.g. MyISAM before upgrading
- by using "mysql_convert_table_format" or "ALTER TABLE x ENGINE=MyISAM".
- The installation of mysql-server-5.1 will now abort. In case your old
- mysql-server-4.1 gets removed nevertheless just reinstall it to convert
- those tables.
-
 Template: mysql-server/root_password
 Type: password
 _Description: New password for the MySQL "root" user:
@@ -91,3 +81,10 @@
 Type: error
 _Description: Password input error
  The two passwords you entered were not the same. Please try again.
+
+Template: mysql-server/no_upgrade_when_using_ndb
+Type: error
+_Description: NDB Cluster seems to be in use
+ MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new
+ mysql-cluster package and remove all lines starting with "ndb" from
+ all config files below /etc/mysql/.


