[gentoo-doc-cvs] cvs commit: mysql-upgrading.xml - gentoo-doc-cvs

From:	Josh Saddler <nightmorph@×××××××××××.org>
To:	gentoo-doc-cvs@l.g.o
Subject:	[gentoo-doc-cvs] cvs commit: mysql-upgrading.xml
Date:	Sun, 10 Sep 2006 21:11:16
Message-Id:	`20060910211123.E81886466A@smtp.gentoo.org`

1

nightmorph    06/09/10 21:11:22

2

3

  Modified:             mysql-upgrading.xml

4

  Log:

5

  numerous fixes for bug 147078

6

7

Revision  Changes    Path

8

1.14                 xml/htdocs/doc/en/mysql-upgrading.xml

9

10

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&view=markup

11

plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&content-type=text/plain

12

diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?r1=1.13&r2=1.14

13

14

Index: mysql-upgrading.xml

15

===================================================================

16

RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v

17

retrieving revision 1.13

18

retrieving revision 1.14

19

diff -u -r1.13 -r1.14

20

--- mysql-upgrading.xml	10 Sep 2006 01:57:15 -0000	1.13

21

+++ mysql-upgrading.xml	10 Sep 2006 21:11:22 -0000	1.14

22

@@ -1,6 +1,6 @@

23

 <?xml version='1.0' encoding="UTF-8"?>

24

 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">

25

-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.13 2006/09/10 01:57:15 rane Exp $ -->

26

+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.14 2006/09/10 21:11:22 nightmorph Exp $ -->

27

28

 <guide link="/doc/en/mysql-upgrading.xml">

29

 <title>Upgrade guide to MySQL 4.* or 5.0.*</title>

30

@@ -14,16 +14,16 @@

31

32

 <abstract>

33

 The MySQL herd is proud to announce that MySQL 5.0 will soon be found in

34

-Gentoo's stable tree. This document describes how to upgrade from MySQL 4.* to

35

-5.0.*

36

+Gentoo's stable tree. This document describes how to upgrade to MySQL 4.* and

37

+to 5.0.*.

38

 </abstract>

39

40

 <!-- The content of this document is licensed under the CC-BY-SA license -->

41

 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->

42

 <license/>

43

44

-<version>1.10</version>

45

-<date>2006-09-09</date>

46

+<version>1.11</version>

47

+<date>2006-09-10</date>

48

49

 <chapter>

50

 <title>Straight upgrade, suggested for 4.1 =&gt; 5.0 migration</title>

51

@@ -31,11 +31,11 @@

52

 <body>

53

54

<p>

55

-The myisam storage engine in 4.1 version was already mature enough to allow a

56

+The myisam storage engine in version 4.1 was already mature enough to allow a

57

 direct upgrade to the next major version of MySQL.

58

 </p>

59

60

-<pre caption="Straight upgrade">

61

+<pre caption="Straight upgrade from 4.1 to 5.0.*">

62

 # <i>quickpkg dev-db/mysql</i>

63

 # <i>alias MYSQL="mysql --user=root --password=</i><comment>'your_password'</comment><i>"</i>

64

 # <i>DATADIR=$(MYSQL --batch --raw --silent --skip-column-names \</i>

65

@@ -149,11 +149,11 @@

66

 <note>

67

 Now two different backups should exist: the SQL one, which is portable between

68

 various versions of MySQL, and the other one that will allow you to quickly

69

-restore your database. This is covered later in this doc in more detail.

70

+restore your database. This is covered later in this document in more detail.

71

 </note>

72

73

<p>

74

-After you got rid of your old MySQL installation, you can now install the new

75

+After you get rid of your old MySQL installation, you can now install the new

76

 version. Note that <c>revdep-rebuild</c> is necessary for rebuilding packages

77

 linking against MySQL.

78

 </p>

79

@@ -187,16 +187,16 @@

80

 </impo>

81

82

 <impo>

83

-The default character set in gentoo mysql 4.1 and above is <c>utf8</c>. If the

84

-data contain <e>non</e>-ASCII characters, you may want to preserve the default

85

+The default character set in MySQL 4.1 and above is <c>utf8</c>. If the data

86

+contain <e>non</e>-ASCII characters, you may want to preserve the default

87

 character set of the database replacing all occurrences of <c>utf8</c> with

88

-<c>latin1</c> into the <path>/etc/mysql/my.cnf</path> config file. More

89

+<c>latin1</c> in the <path>/etc/mysql/my.cnf</path> config file. More

90

 information can be found <uri link="#On_charset_conversion">Charset

91

-conversion</uri> charapter.

92

+conversion</uri> chapter.

93

 </impo>

94

95

 <impo>

96

-The administrative <c>mysql</c> database that containins user names, passwords

97

+The administrative <c>mysql</c> database that contains user names, passwords

98

 amongst other things is and <b>must</b> be in encoded in utf8.

99

 </impo>

100

101

@@ -268,7 +268,7 @@

102

 <body>

103

104

<p>

105

-This charapter is not intended to be an exhaustive guide on how to do such

106

+This chapter is not intended to be an exhaustive guide on how to do such

107

 conversions, rather a short list of hints on which the reader can elaborate.

108

 </p>

109

110

@@ -285,8 +285,8 @@

111

 <body>

112

113

<p>

114

-Every utf-8 char is considered 3 bytes long within an index. Indexes in MySQL

115

-can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the

116

+Every utf-8 character is considered 3 bytes long within an index. Indexes in

117

+MySQL can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the

118

 limits are measured in bytes, whereas the length of a column is interpreted as

119

 number of characters.

120

 </p>

121

@@ -353,7 +353,7 @@

122

 Working in a utf-8 environment, with utf-8 editors and tools help too:

123

 </p>

124

125

-<pre caption="Shell evironment variables">

126

+<pre caption="Shell environment variables">

127

 LC_ALL=en_US.UTF-8

128

 LANG=en_US.UTF-8

129

 export LC_ALL LANG

130

@@ -409,7 +409,7 @@

131

 <body>

132

133

<p>

134

-To use utf-8 with apache, you need to adjust the folowing variables in

135

+To use utf-8 with apache, you need to adjust the following variables in

136

 <path>httpd.conf</path>: AddDefaultCharset, CharsetDefault, CharsetSourceEnc.

137

 If your source html files aren't encoded in utf-8, they <b>must</b> be

138

 converted with <c>iconv</c> or <c>recode</c>.

--

143

gentoo-doc-cvs@g.o mailing list

1	nightmorph 06/09/10 21:11:22
2
3	Modified: mysql-upgrading.xml
4	Log:
5	numerous fixes for bug 147078
6
7	Revision Changes Path
8	1.14 xml/htdocs/doc/en/mysql-upgrading.xml
9
10	file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&view=markup
11	plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&content-type=text/plain
12	diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?r1=1.13&r2=1.14
13
14	Index: mysql-upgrading.xml
15	===================================================================
16	RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v
17	retrieving revision 1.13
18	retrieving revision 1.14
19	diff -u -r1.13 -r1.14
20	--- mysql-upgrading.xml 10 Sep 2006 01:57:15 -0000 1.13
21	+++ mysql-upgrading.xml 10 Sep 2006 21:11:22 -0000 1.14
22	@@ -1,6 +1,6 @@
23	<?xml version='1.0' encoding="UTF-8"?>
24	<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25	-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.13 2006/09/10 01:57:15 rane Exp $ -->
26	+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.14 2006/09/10 21:11:22 nightmorph Exp $ -->
27
28	<guide link="/doc/en/mysql-upgrading.xml">
29	<title>Upgrade guide to MySQL 4.* or 5.0.*</title>
30	@@ -14,16 +14,16 @@
31
32	<abstract>
33	The MySQL herd is proud to announce that MySQL 5.0 will soon be found in
34	-Gentoo's stable tree. This document describes how to upgrade from MySQL 4.* to
35	-5.0.*
36	+Gentoo's stable tree. This document describes how to upgrade to MySQL 4.* and
37	+to 5.0.*.
38	</abstract>
39
40	<!-- The content of this document is licensed under the CC-BY-SA license -->
41	<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
42	<license/>
43
44	-<version>1.10</version>
45	-<date>2006-09-09</date>
46	+<version>1.11</version>
47	+<date>2006-09-10</date>
48
49	<chapter>
50	<title>Straight upgrade, suggested for 4.1 => 5.0 migration</title>
51	@@ -31,11 +31,11 @@
52	<body>
53
54	<p>
55	-The myisam storage engine in 4.1 version was already mature enough to allow a
56	+The myisam storage engine in version 4.1 was already mature enough to allow a
57	direct upgrade to the next major version of MySQL.
58	</p>
59
60	-<pre caption="Straight upgrade">
61	+<pre caption="Straight upgrade from 4.1 to 5.0.*">
62	# <i>quickpkg dev-db/mysql</i>
63	# <i>alias MYSQL="mysql --user=root --password=</i><comment>'your_password'</comment><i>"</i>
64	# <i>DATADIR=$(MYSQL --batch --raw --silent --skip-column-names \</i>
65	@@ -149,11 +149,11 @@
66	<note>
67	Now two different backups should exist: the SQL one, which is portable between
68	various versions of MySQL, and the other one that will allow you to quickly
69	-restore your database. This is covered later in this doc in more detail.
70	+restore your database. This is covered later in this document in more detail.
71	</note>
72
73	<p>
74	-After you got rid of your old MySQL installation, you can now install the new
75	+After you get rid of your old MySQL installation, you can now install the new
76	version. Note that <c>revdep-rebuild</c> is necessary for rebuilding packages
77	linking against MySQL.
78	</p>
79	@@ -187,16 +187,16 @@
80	</impo>
81
82	<impo>
83	-The default character set in gentoo mysql 4.1 and above is <c>utf8</c>. If the
84	-data contain <e>non</e>-ASCII characters, you may want to preserve the default
85	+The default character set in MySQL 4.1 and above is <c>utf8</c>. If the data
86	+contain <e>non</e>-ASCII characters, you may want to preserve the default
87	character set of the database replacing all occurrences of <c>utf8</c> with
88	-<c>latin1</c> into the <path>/etc/mysql/my.cnf</path> config file. More
89	+<c>latin1</c> in the <path>/etc/mysql/my.cnf</path> config file. More
90	information can be found <uri link="#On_charset_conversion">Charset
91	-conversion</uri> charapter.
92	+conversion</uri> chapter.
93	</impo>
94
95	<impo>
96	-The administrative <c>mysql</c> database that containins user names, passwords
97	+The administrative <c>mysql</c> database that contains user names, passwords
98	amongst other things is and <b>must</b> be in encoded in utf8.
99	</impo>
100
101	@@ -268,7 +268,7 @@
102	<body>
103
104	<p>
105	-This charapter is not intended to be an exhaustive guide on how to do such
106	+This chapter is not intended to be an exhaustive guide on how to do such
107	conversions, rather a short list of hints on which the reader can elaborate.
108	</p>
109
110	@@ -285,8 +285,8 @@
111	<body>
112
113	<p>
114	-Every utf-8 char is considered 3 bytes long within an index. Indexes in MySQL
115	-can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the
116	+Every utf-8 character is considered 3 bytes long within an index. Indexes in
117	+MySQL can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the
118	limits are measured in bytes, whereas the length of a column is interpreted as
119	number of characters.
120	</p>
121	@@ -353,7 +353,7 @@
122	Working in a utf-8 environment, with utf-8 editors and tools help too:
123	</p>
124
125	-<pre caption="Shell evironment variables">
126	+<pre caption="Shell environment variables">
127	LC_ALL=en_US.UTF-8
128	LANG=en_US.UTF-8
129	export LC_ALL LANG
130	@@ -409,7 +409,7 @@
131	<body>
132
133	<p>
134	-To use utf-8 with apache, you need to adjust the folowing variables in
135	+To use utf-8 with apache, you need to adjust the following variables in
136	<path>httpd.conf</path>: AddDefaultCharset, CharsetDefault, CharsetSourceEnc.
137	If your source html files aren't encoded in utf-8, they <b>must</b> be
138	converted with <c>iconv</c> or <c>recode</c>.
139
140
141
142	--
143	gentoo-doc-cvs@g.o mailing list

Gentoo Archives: gentoo-doc-cvs