List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 1 2008 3:31pm
Subject:svn commit - mysqldoc@docsrva: r11466 - in trunk: . refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-08-01 17:31:30 +0200 (Fri, 01 Aug 2008)
New Revision: 11466

Log:
 r33133@frost:  paul | 2008-07-30 20:33:42 -0500
 Fix documentation bug:
 Bug#31323: Installation instructions
 (include instructions for setting password of root@stripped account)


Modified:
   trunk/refman-5.0/installing-cs-core.xml
   trunk/refman-5.1/installing-core.xml
   trunk/refman-6.0/installing-core.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33129
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32656
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33133
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32656


Modified: trunk/refman-5.0/installing-cs-core.xml
===================================================================
--- trunk/refman-5.0/installing-cs-core.xml	2008-07-31 18:05:04 UTC (rev 11465)
+++ trunk/refman-5.0/installing-cs-core.xml	2008-08-01 15:31:30 UTC (rev 11466)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 3; 2132 bytes

@@ -12856,7 +12856,7 @@
 
       <para>
         To assign passwords using <literal>SET PASSWORD</literal>,
-        connect to the server as <literal>root</literal> and issue two
+        connect to the server as <literal>root</literal> and issue
         <literal>SET PASSWORD</literal> statements. Be sure to encrypt
         the password using the
         <function role="sql">PASSWORD()</function> function.

@@ -12890,6 +12890,18 @@
       </para>
 
       <para>
+        If the <literal>user</literal> table contains an account with
+        <literal>User</literal> and <literal>Host</literal> values of
+        <literal>'root'</literal> and <literal>'127.0.0.1'</literal>,
+        use an additional <literal>SET PASSWORD</literal> statement to
+        set that account's password:
+      </para>
+
+<programlisting>
+mysql&gt; <userinput>SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('<replaceable>newpwd</replaceable>');</userinput>
+</programlisting>
+
+      <para>
         To assign passwords to the <literal>root</literal> accounts
         using <command>mysqladmin</command>, execute the following
         commands:

@@ -12910,10 +12922,17 @@
       </para>
 
       <para>
+        The <command>mysqladmin</command> method of setting the
+        <literal>root</literal> account passwords does not set the
+        password for the <literal>'root'@'127.0.0.1'</literal> account.
+        To do so, use <literal>SET PASSWORD</literal> as shown earlier.
+      </para>
+
+      <para>
         You can also use <literal>UPDATE</literal> to modify the
         <literal>user</literal> table directly. The following
-        <literal>UPDATE</literal> statement assigns a password to both
-        <literal>root</literal> accounts at once:
+        <literal>UPDATE</literal> statement assigns a password to all
+        <literal>root</literal> accounts:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml	2008-07-31 18:05:04 UTC (rev 11465)
+++ trunk/refman-5.1/installing-core.xml	2008-08-01 15:31:30 UTC (rev 11466)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 3; 2123 bytes

@@ -12093,7 +12093,7 @@
 
       <para>
         To assign passwords using <literal>SET PASSWORD</literal>,
-        connect to the server as <literal>root</literal> and issue two
+        connect to the server as <literal>root</literal> and issue
         <literal>SET PASSWORD</literal> statements. Be sure to encrypt
         the password using the
         <function role="sql">PASSWORD()</function> function.

@@ -12127,6 +12127,18 @@
       </para>
 
       <para>
+        If the <literal>user</literal> table contains an account with
+        <literal>User</literal> and <literal>Host</literal> values of
+        <literal>'root'</literal> and <literal>'127.0.0.1'</literal>,
+        use an additional <literal>SET PASSWORD</literal> statement to
+        set that account's password:
+      </para>
+
+<programlisting>
+mysql&gt; <userinput>SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('<replaceable>newpwd</replaceable>');</userinput>
+</programlisting>
+
+      <para>
         To assign passwords to the <literal>root</literal> accounts
         using <command>mysqladmin</command>, execute the following
         commands:

@@ -12147,10 +12159,17 @@
       </para>
 
       <para>
+        The <command>mysqladmin</command> method of setting the
+        <literal>root</literal> account passwords does not set the
+        password for the <literal>'root'@'127.0.0.1'</literal> account.
+        To do so, use <literal>SET PASSWORD</literal> as shown earlier.
+      </para>
+
+      <para>
         You can also use <literal>UPDATE</literal> to modify the
         <literal>user</literal> table directly. The following
-        <literal>UPDATE</literal> statement assigns a password to both
-        <literal>root</literal> accounts at once:
+        <literal>UPDATE</literal> statement assigns a password to all
+        <literal>root</literal> accounts:
       </para>
 
 <programlisting>


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2008-07-31 18:05:04 UTC (rev 11465)
+++ trunk/refman-6.0/installing-core.xml	2008-08-01 15:31:30 UTC (rev 11466)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 3; 2123 bytes

@@ -12123,7 +12123,7 @@
 
       <para>
         To assign passwords using <literal>SET PASSWORD</literal>,
-        connect to the server as <literal>root</literal> and issue two
+        connect to the server as <literal>root</literal> and issue
         <literal>SET PASSWORD</literal> statements. Be sure to encrypt
         the password using the
         <function role="sql">PASSWORD()</function> function.

@@ -12157,6 +12157,18 @@
       </para>
 
       <para>
+        If the <literal>user</literal> table contains an account with
+        <literal>User</literal> and <literal>Host</literal> values of
+        <literal>'root'</literal> and <literal>'127.0.0.1'</literal>,
+        use an additional <literal>SET PASSWORD</literal> statement to
+        set that account's password:
+      </para>
+
+<programlisting>
+mysql&gt; <userinput>SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('<replaceable>newpwd</replaceable>');</userinput>
+</programlisting>
+
+      <para>
         To assign passwords to the <literal>root</literal> accounts
         using <command>mysqladmin</command>, execute the following
         commands:

@@ -12177,10 +12189,17 @@
       </para>
 
       <para>
+        The <command>mysqladmin</command> method of setting the
+        <literal>root</literal> account passwords does not set the
+        password for the <literal>'root'@'127.0.0.1'</literal> account.
+        To do so, use <literal>SET PASSWORD</literal> as shown earlier.
+      </para>
+
+      <para>
         You can also use <literal>UPDATE</literal> to modify the
         <literal>user</literal> table directly. The following
-        <literal>UPDATE</literal> statement assigns a password to both
-        <literal>root</literal> accounts at once:
+        <literal>UPDATE</literal> statement assigns a password to all
+        <literal>root</literal> accounts:
       </para>
 
 <programlisting>


Thread
svn commit - mysqldoc@docsrva: r11466 - in trunk: . refman-5.0 refman-5.1 refman-6.0paul.dubois1 Aug