List:Commits« Previous MessageNext Message »
From:paul Date:January 31 2006 2:15pm
Subject:svn commit - mysqldoc@docsrva: r1147 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-31 15:15:01 +0100 (Tue, 31 Jan 2006)
New Revision: 1147

Log:
 r6970@frost:  paul | 2006-01-31 08:08:28 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.1/ndbcluster.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6968
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6970
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-31 04:26:46 UTC (rev 1146)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-31 14:15:01 UTC (rev 1147)
@@ -858,9 +858,16 @@
           </para>
 
 <programlisting>
-groupadd mysql
-useradd -g mysql mysql
+shell&gt; <userinput>groupadd mysql</userinput>
+shell&gt; <userinput>useradd -g mysql mysql</userinput>
 </programlisting>
+
+          <para>
+            The syntax for <command>useradd</command> and
+            <command>groupadd</command> may differ slightly on different
+            versions of Unix, or they may have different names such as
+            <command>adduser</command> and <command>addgroup</command>.
+          </para>
         </listitem>
 
         <listitem>
@@ -872,9 +879,9 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz
-ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -885,8 +892,8 @@
           </para>
 
 <programlisting>
-cd mysql
-scripts/mysql_install_db --user=mysql
+shell&gt; <userinput>cd mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -897,9 +904,9 @@
           </para>
 
 <programlisting>
-chown -R root .
-chown -R mysql data
-chgrp -R mysql .
+shell&gt; <userinput>chown -R root .</userinput>
+shell&gt; <userinput>chown -R mysql data</userinput>
+shell&gt; <userinput>chgrp -R mysql .</userinput>
 </programlisting>
 
           <para>
@@ -918,9 +925,9 @@
           </para>
 
 <programlisting>
-cp support-files/mysql.server /etc/rc.d/init.d/
-chmod +x /etc/rc.d/init.d/mysql.server
-chkconfig --add mysql.server
+shell&gt; <userinput>cp support-files/mysql.server /etc/rc.d/init.d/</userinput>
+shell&gt; <userinput>chmod +x /etc/rc.d/init.d/mysql.server</userinput>
+shell&gt; <userinput>chkconfig --add mysql.server</userinput>
 </programlisting>
 
           <para>
@@ -967,8 +974,8 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'</userinput>
 </programlisting>
         </listitem>
 
@@ -979,8 +986,8 @@
           </para>
 
 <programlisting>
-cd /usr/local/bin
-chmod +x ndb_mgm*
+shell&gt; <userinput>cd /usr/local/bin</userinput>
+shell&gt; <userinput>chmod +x ndb_mgm*</userinput>
 </programlisting>
         </listitem>
 
@@ -1052,10 +1059,15 @@
       </para>
 
 <programlisting>
-vi /etc/my.cnf
+shell&gt; <userinput>vi /etc/my.cnf</userinput>
 </programlisting>
 
       <para>
+        We show <command>vi</command> being used here to create the
+        file, but any text editor should work just as well.
+      </para>
+
+      <para>
         For each data node and SQL node in our example setup,
         <filename>my.cnf</filename> should look like this:
       </para>
@@ -1088,17 +1100,12 @@
       </para>
 
 <programlisting>
-mkdir /var/lib/mysql-cluster
-cd /var/lib/mysql-cluster
-vi config.ini
+shell&gt; <userinput>mkdir /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>cd /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>vi config.ini</userinput>
 </programlisting>
 
       <para>
-        We show <command>vi</command> being used here to create the
-        file, but any text editor should work just as well.
-      </para>
-
-      <para>
         For our representative setup, the
         <filename>config.ini</filename> file should read as follows:
       </para>
@@ -2022,7 +2029,7 @@
       </para>
 
 <programlisting>
-NDB&gt; SHOW
+NDB&gt; <userinput>SHOW</userinput>
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     1 node(s)
@@ -2335,15 +2342,16 @@
     
 &lt;nodeid-specification&gt; := <replaceable>node_id</replaceable>
 
-&lt;host-specification&gt; := <replaceable>host</replaceable>[:<replaceable>port</replaceable>]
+&lt;host-specification&gt; := <replaceable>host_name</replaceable>[:<replaceable>port_num</replaceable>]
 </programlisting>
 
         <para>
           <literal>node_id</literal> is an integer larger than 1 which
           identifies a node in <filename>config.ini</filename>.
-          <replaceable>port</replaceable> is an integer referring to a
-          regular Unix port. <replaceable>host</replaceable> is a string
-          representing a valid Internet host address.
+          <replaceable>host_name</replaceable> is a string representing
+          a valid Internet host name or IP address.
+          <replaceable>port_num</replaceable> is an integer referring to
+          a TCP/IP port number.
         </para>
 
 <programlisting>
@@ -2354,7 +2362,7 @@
         <para>
           All nodes will use <literal>localhost:1186</literal> as the
           default connectstring value if none is provided. If
-          <literal>&lt;port&gt;</literal> is omitted from the
+          <replaceable>port_num</replaceable> is omitted from the
           connectstring, the default port is 1186.
           (<emphasis role="bold">Note</emphasis>: Prior to MySQL 4.1.8,
           the default port was 2200.) This port should always be

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-31 04:26:46 UTC (rev 1146)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-31 14:15:01 UTC (rev 1147)
@@ -857,9 +857,16 @@
           </para>
 
 <programlisting>
-groupadd mysql
-useradd -g mysql mysql
+shell&gt; <userinput>groupadd mysql</userinput>
+shell&gt; <userinput>useradd -g mysql mysql</userinput>
 </programlisting>
+
+          <para>
+            The syntax for <command>useradd</command> and
+            <command>groupadd</command> may differ slightly on different
+            versions of Unix, or they may have different names such as
+            <command>adduser</command> and <command>addgroup</command>.
+          </para>
         </listitem>
 
         <listitem>
@@ -871,9 +878,9 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz
-ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -884,8 +891,8 @@
           </para>
 
 <programlisting>
-cd mysql
-scripts/mysql_install_db --user=mysql
+shell&gt; <userinput>cd mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -896,9 +903,9 @@
           </para>
 
 <programlisting>
-chown -R root .
-chown -R mysql data
-chgrp -R mysql .
+shell&gt; <userinput>chown -R root .</userinput>
+shell&gt; <userinput>chown -R mysql data</userinput>
+shell&gt; <userinput>chgrp -R mysql .</userinput>
 </programlisting>
 
           <para>
@@ -917,9 +924,9 @@
           </para>
 
 <programlisting>
-cp support-files/mysql.server /etc/rc.d/init.d/
-chmod +x /etc/rc.d/init.d/mysql.server
-chkconfig --add mysql.server
+shell&gt; <userinput>cp support-files/mysql.server /etc/rc.d/init.d/</userinput>
+shell&gt; <userinput>chmod +x /etc/rc.d/init.d/mysql.server</userinput>
+shell&gt; <userinput>chkconfig --add mysql.server</userinput>
 </programlisting>
 
           <para>
@@ -966,8 +973,8 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'</userinput>
 </programlisting>
         </listitem>
 
@@ -978,8 +985,8 @@
           </para>
 
 <programlisting>
-cd /usr/local/bin
-chmod +x ndb_mgm*
+shell&gt; <userinput>cd /usr/local/bin</userinput>
+shell&gt; <userinput>chmod +x ndb_mgm*</userinput>
 </programlisting>
         </listitem>
 
@@ -1051,10 +1058,15 @@
       </para>
 
 <programlisting>
-vi /etc/my.cnf
+shell&gt; <userinput>vi /etc/my.cnf</userinput>
 </programlisting>
 
       <para>
+        We show <command>vi</command> being used here to create the
+        file, but any text editor should work just as well.
+      </para>
+
+      <para>
         For each data node and SQL node in our example setup,
         <filename>my.cnf</filename> should look like this:
       </para>
@@ -1087,17 +1099,12 @@
       </para>
 
 <programlisting>
-mkdir /var/lib/mysql-cluster
-cd /var/lib/mysql-cluster
-vi config.ini
+shell&gt; <userinput>mkdir /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>cd /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>vi config.ini</userinput>
 </programlisting>
 
       <para>
-        We show <command>vi</command> being used here to create the
-        file, but any text editor should work just as well.
-      </para>
-
-      <para>
         For our representative setup, the
         <filename>config.ini</filename> file should read as follows:
       </para>
@@ -2022,7 +2029,7 @@
       </para>
 
 <programlisting>
-NDB&gt; SHOW
+NDB&gt; <userinput>SHOW</userinput>
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     1 node(s)
@@ -2323,15 +2330,16 @@
     
 &lt;nodeid-specification&gt; := <replaceable>node_id</replaceable>
 
-&lt;host-specification&gt; := <replaceable>host</replaceable>[:<replaceable>port</replaceable>]
+&lt;host-specification&gt; := <replaceable>host_name</replaceable>[:<replaceable>port_num</replaceable>]
 </programlisting>
 
         <para>
           <literal>node_id</literal> is an integer larger than 1 which
           identifies a node in <filename>config.ini</filename>.
-          <replaceable>port</replaceable> is an integer referring to a
-          regular Unix port. <replaceable>host</replaceable> is a string
-          representing a valid Internet host address.
+          <replaceable>host_name</replaceable> is a string representing
+          a valid Internet host name or IP address.
+          <replaceable>port_num</replaceable> is an integer referring to
+          a TCP/IP port number.
         </para>
 
 <programlisting>
@@ -2342,7 +2350,7 @@
         <para>
           All nodes will use <literal>localhost:1186</literal> as the
           default connectstring value if none is provided. If
-          <literal>&lt;port&gt;</literal> is omitted from the
+          <replaceable>port_num</replaceable> is omitted from the
           connectstring, the default port is 1186. This port should
           always be available on the network because it has been
           assigned by IANA for this purpose (see

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-31 04:26:46 UTC (rev 1146)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-31 14:15:01 UTC (rev 1147)
@@ -857,9 +857,16 @@
           </para>
 
 <programlisting>
-groupadd mysql
-useradd -g mysql mysql
+shell&gt; <userinput>groupadd mysql</userinput>
+shell&gt; <userinput>useradd -g mysql mysql</userinput>
 </programlisting>
+
+          <para>
+            The syntax for <command>useradd</command> and
+            <command>groupadd</command> may differ slightly on different
+            versions of Unix, or they may have different names such as
+            <command>adduser</command> and <command>addgroup</command>.
+          </para>
         </listitem>
 
         <listitem>
@@ -871,9 +878,9 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz
-ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -xzvf -C /usr/local/bin mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/bin/mysql-max-&current-version;-pc-linux-gnu-i686 mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -884,8 +891,8 @@
           </para>
 
 <programlisting>
-cd mysql
-scripts/mysql_install_db --user=mysql
+shell&gt; <userinput>cd mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 </programlisting>
         </listitem>
 
@@ -896,9 +903,9 @@
           </para>
 
 <programlisting>
-chown -R root .
-chown -R mysql data
-chgrp -R mysql .
+shell&gt; <userinput>chown -R root .</userinput>
+shell&gt; <userinput>chown -R mysql data</userinput>
+shell&gt; <userinput>chgrp -R mysql .</userinput>
 </programlisting>
 
           <para>
@@ -917,9 +924,9 @@
           </para>
 
 <programlisting>
-cp support-files/mysql.server /etc/rc.d/init.d/
-chmod +x /etc/rc.d/init.d/mysql.server
-chkconfig --add mysql.server
+shell&gt; <userinput>cp support-files/mysql.server /etc/rc.d/init.d/</userinput>
+shell&gt; <userinput>chmod +x /etc/rc.d/init.d/mysql.server</userinput>
+shell&gt; <userinput>chkconfig --add mysql.server</userinput>
 </programlisting>
 
           <para>
@@ -966,8 +973,8 @@
           </para>
 
 <programlisting>
-cd /var/tmp
-tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'
+shell&gt; <userinput>cd /var/tmp</userinput>
+shell&gt; <userinput>tar -zxvf mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz /usr/local/bin '*/bin/ndb_mgm*'</userinput>
 </programlisting>
         </listitem>
 
@@ -978,8 +985,8 @@
           </para>
 
 <programlisting>
-cd /usr/local/bin
-chmod +x ndb_mgm*
+shell&gt; <userinput>cd /usr/local/bin</userinput>
+shell&gt; <userinput>chmod +x ndb_mgm*</userinput>
 </programlisting>
         </listitem>
 
@@ -1051,10 +1058,15 @@
       </para>
 
 <programlisting>
-vi /etc/my.cnf
+shell&gt; <userinput>vi /etc/my.cnf</userinput>
 </programlisting>
 
       <para>
+        We show <command>vi</command> being used here to create the
+        file, but any text editor should work just as well.
+      </para>
+
+      <para>
         For each data node and SQL node in our example setup,
         <filename>my.cnf</filename> should look like this:
       </para>
@@ -1087,17 +1099,12 @@
       </para>
 
 <programlisting>
-mkdir /var/lib/mysql-cluster
-cd /var/lib/mysql-cluster
-vi config.ini
+shell&gt; <userinput>mkdir /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>cd /var/lib/mysql-cluster</userinput>
+shell&gt; <userinput>vi config.ini</userinput>
 </programlisting>
 
       <para>
-        We show <command>vi</command> being used here to create the
-        file, but any text editor should work just as well.
-      </para>
-
-      <para>
         For our representative setup, the
         <filename>config.ini</filename> file should read as follows:
       </para>
@@ -2020,7 +2027,7 @@
       </para>
 
 <programlisting>
-NDB&gt; SHOW
+NDB&gt; <userinput>SHOW</userinput>
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     1 node(s)
@@ -2321,15 +2328,16 @@
     
 &lt;nodeid-specification&gt; := <replaceable>node_id</replaceable>
 
-&lt;host-specification&gt; := <replaceable>host</replaceable>[:<replaceable>port</replaceable>]
+&lt;host-specification&gt; := <replaceable>host_name</replaceable>[:<replaceable>port_num</replaceable>]
 </programlisting>
 
         <para>
           <literal>node_id</literal> is an integer larger than 1 which
           identifies a node in <filename>config.ini</filename>.
-          <replaceable>port</replaceable> is an integer referring to a
-          regular Unix port. <replaceable>host</replaceable> is a string
-          representing a valid Internet host address.
+          <replaceable>host_name</replaceable> is a string representing
+          a valid Internet host name or IP address.
+          <replaceable>port_num</replaceable> is an integer referring to
+          a TCP/IP port number.
         </para>
 
 <programlisting>
@@ -2340,7 +2348,7 @@
         <para>
           All nodes will use <literal>localhost:1186</literal> as the
           default connectstring value if none is provided. If
-          <literal>&lt;port&gt;</literal> is omitted from the
+          <replaceable>port_num</replaceable> is omitted from the
           connectstring, the default port is 1186. This port should
           always be available on the network because it has been
           assigned by IANA for this purpose (see

Thread
svn commit - mysqldoc@docsrva: r1147 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul31 Jan