Author: paul
Date: 2010-10-26 19:32:19 +0200 (Tue, 26 Oct 2010)
New Revision: 23395
Log:
r64739@frost: paul | 2010-10-26 12:27:57 -0500
Encode & properly
Modified:
trunk/dynamic-docs/changelog/mysqld-versions.xml
trunk/refman-5.5/installing-updowngrade.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43536
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64730
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43536
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64739
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/dynamic-docs/changelog/mysqld-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-versions.xml 2010-10-26 17:28:18 UTC (rev 23394)
+++ trunk/dynamic-docs/changelog/mysqld-versions.xml 2010-10-26 17:32:19 UTC (rev 23395)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 920 bytes
@@ -52,7 +52,7 @@
<command>mysql_upgrade</command>. For example:
</para>
<programlisting>
-shell> <userinput>mysqld --skip-grant-tables &</userinput>
+shell> <userinput>mysqld --skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
<para>
@@ -68,7 +68,7 @@
</para>
<programlisting>
shell> <userinput>mysqld --defaults-file=/usr/local/mysql/etc/my.cnf</userinput>
- <userinput>--skip-grant-tables &</userinput>
+ <userinput>--skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
Modified: trunk/refman-5.5/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.5/installing-updowngrade.xml 2010-10-26 17:28:18 UTC (rev 23394)
+++ trunk/refman-5.5/installing-updowngrade.xml 2010-10-26 17:32:19 UTC (rev 23395)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1424 bytes
@@ -478,7 +478,7 @@
</para>
<programlisting>
-shell> <userinput>mysqld --skip-grant-tables &</userinput>
+shell> <userinput>mysqld --skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
@@ -497,7 +497,7 @@
<programlisting>
shell> <userinput>mysqld --defaults-file=/usr/local/mysql/etc/my.cnf</userinput>
- <userinput>--skip-grant-tables &</userinput>
+ <userinput>--skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
</listitem>
@@ -1282,7 +1282,7 @@
</para>
<programlisting>
-shell> <userinput>mysqld --skip-grant-tables &</userinput>
+shell> <userinput>mysqld --skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
@@ -1301,7 +1301,7 @@
<programlisting>
shell> <userinput>mysqld --defaults-file=/usr/local/mysql/etc/my.cnf</userinput>
- <userinput>--skip-grant-tables &</userinput>
+ <userinput>--skip-grant-tables &</userinput>
shell> <userinput>mysql_upgrade</userinput>
</programlisting>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23395 - in trunk: . dynamic-docs/changelog refman-5.5 | paul.dubois | 26 Oct |
