From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org)
	by nuthatch.gentoo.org with esmtp (Exim 4.62)
	(envelope-from <gentoo-doc-cvs+bounces-2252-garchives=archives.gentoo.org@gentoo.org>)
	id 1H0Acx-0007ft-4U
	for garchives@archives.gentoo.org; Fri, 29 Dec 2006 05:49:59 +0000
Received: from robin.gentoo.org (localhost [127.0.0.1])
	by robin.gentoo.org (8.13.8/8.13.8) with SMTP id kBT5nnOx032046;
	Fri, 29 Dec 2006 05:49:49 GMT
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by robin.gentoo.org (8.13.8/8.13.8) with ESMTP id kBT5nmij002671
	for <gentoo-doc-cvs@lists.gentoo.org>; Fri, 29 Dec 2006 05:49:49 GMT
Received: from lark (lark.gentoo.osuosl.org [140.211.166.177])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with SMTP id 68211646EB
	for <gentoo-doc-cvs@lists.gentoo.org>; Fri, 29 Dec 2006 05:49:48 +0000 (UTC)
Received: by lark (sSMTP sendmail emulation); Fri, 29 Dec 2006 05:49:48 +0000
From: "Josh Saddler" <nightmorph@lark.gentoo.org>
Date: Fri, 29 Dec 2006 05:49:48 +0000
To: gentoo-doc-cvs@lists.gentoo.org
Subject: [gentoo-doc-cvs] cvs commit: mysql-upgrading.xml
Message-Id: <20061229054948.68211646EB@smtp.gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-doc-cvs@lists.gentoo.org>
List-Help: <mailto:gentoo-doc-cvs+help@gentoo.org>
List-Unsubscribe: <mailto:gentoo-doc-cvs+unsubscribe@gentoo.org>
List-Subscribe: <mailto:gentoo-doc-cvs+subscribe@gentoo.org>
List-Id: Gentoo Linux mail <gentoo-doc-cvs.gentoo.org>
X-BeenThere: gentoo-doc-cvs@gentoo.org
Reply-to: docs-team@lists.gentoo.org
X-Archives-Salt: 75de10c8-28c8-4dd7-a2d9-6aabda0c3105
X-Archives-Hash: 6167bb5a3d1a9e9519d584c0233b0e91

nightmorph    06/12/29 05:49:47

  Modified:             mysql-upgrading.xml
  Log:
  added MERGE tables note for bug 159340

Revision  Changes    Path
1.18                 xml/htdocs/doc/en/mysql-upgrading.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?r1=1.17&r2=1.18

Index: mysql-upgrading.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mysql-upgrading.xml	4 Dec 2006 16:42:50 -0000	1.17
+++ mysql-upgrading.xml	29 Dec 2006 05:49:47 -0000	1.18
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.17 2006/12/04 16:42:50 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.18 2006/12/29 05:49:47 nightmorph Exp $ -->
 
 <guide link="/doc/en/mysql-upgrading.xml">
 <title>Upgrade guide to MySQL 4.* or 5.0.*</title>
@@ -22,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.14</version>
-<date>2006-12-04</date>
+<version>1.15</version>
+<date>2006-12-28</date>
 
 <chapter>
 <title>Straight upgrade, suggested for 4.1 =&gt; 5.0 migration</title>
@@ -35,6 +35,14 @@
 direct upgrade to the next major version of MySQL.
 </p>
 
+<note>
+This is not true for MERGE tables. You will likely run into trouble if you
+attempt a direct upgrade for this (rarely used) type of table. You should dump
+and recreate those tables and restore their contents in the process of
+upgrading. If unsure, you should begin with <uri link="#doc_chap2">Upgrading
+from old versions of MySQL</uri>.
+</note>
+
 <pre caption="Straight upgrade from 4.1 to 5.0.*">
 # <i>quickpkg dev-db/mysql</i>
 # <i>alias MYSQL="mysql --user=root --password=</i><comment>'your_password'</comment><i>"</i>



-- 
gentoo-doc-cvs@gentoo.org mailing list