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

Log:
 r2745@kite-hub:  paul | 2006-01-31 12:19:14 -0600
 Cleanup 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:6975
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2736
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6975
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2745

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-31 16:59:22 UTC (rev 1151)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-31 18:19:58 UTC (rev 1152)
@@ -1452,11 +1452,10 @@
             <xref linkend="mysql-cluster-limitations-in-4-1"/>.) This
             means that, once the <literal>world</literal> database and
             its tables have been created on one data node, you need to
-            issue the statement <literal>CREATE DATABASE
-            world;</literal> followed by <literal>FLUSH
-            TABLES;</literal> on each SQL node in the cluster. This will
-            cause the node to recognize the database and read its table
-            definitions.
+            issue the statement <literal>CREATE DATABASE world</literal>
+            followed by <literal>FLUSH TABLES</literal> on each SQL node
+            in the cluster. This will cause the node to recognize the
+            database and read its table definitions.
           </para>
 
           <para>
@@ -1480,7 +1479,7 @@
           <para>
             If you did not modify the <literal>ENGINE=</literal> clauses
             in the table definitions prior to importing the SQL script,
-            you should run the following commands at this point:
+            you should run the following statements at this point:
           </para>
 
 <programlisting>
@@ -2023,8 +2022,8 @@
 </programlisting>
 
       <para>
-        You can then use the <command>SHOW</command> command from within
-        the management client to obtain a report on the cluster's
+        You can then use the <command>SHOW</command> statement from
+        within the management client to obtain a report on the cluster's
         status:
       </para>
 
@@ -2883,7 +2882,7 @@
               will be the determining factor for the node group. Whether
               or not explicit assignments are made, they can be viewed
               in the output of the management client's
-              <literal>SHOW</literal> command.
+              <literal>SHOW</literal> statement.
             </para>
 
             <para>
@@ -3749,16 +3748,16 @@
             <para>
               When setting <literal>MaxNoOfAttributes</literal>, it is
               important to prepare in advance for any <literal>ALTER
-              TABLE</literal> commands that you might wish to perform in
-              future. This is due to the fact, during the execution of
-              <literal>ALTER TABLE</literal> on a Cluster table, 3 times
-              the number of attributes as in the original table are
-              used. For example, if a table requires 100 attributes, and
-              you wish to be able to alter it later, then you need to
-              set the value of <literal>MaxNoOfAttributes</literal> to
-              300. A good rule of thumb is that, if you can create all
-              desired tables without any problems, then add 2 times the
-              number of attributes in the largest table to
+              TABLE</literal> statements that you might wish to perform
+              in future. This is due to the fact, during the execution
+              of <literal>ALTER TABLE</literal> on a Cluster table, 3
+              times the number of attributes as in the original table
+              are used. For example, if a table requires 100 attributes,
+              and you wish to be able to alter it later, then you need
+              to set the value of <literal>MaxNoOfAttributes</literal>
+              to 300. A good rule of thumb is that, if you can create
+              all desired tables without any problems, then add 2 times
+              the number of attributes in the largest table to
               <literal>MaxNoOfAttributes</literal> to be sure. You
               should also verify that this number is sufficient by
               trying an actual <literal>ALTER TABLE</literal> after
@@ -5507,7 +5506,7 @@
       <para>
         An easy way to verify that your server is running with the
         <literal>NDB Cluster</literal> storage engine enabled is to
-        issue the command <literal>SHOW ENGINES</literal> in the MySQL
+        issue the <literal>SHOW ENGINES</literal> statement in the MySQL
         Monitor (<command>mysql</command>). You should see the value
         <literal>YES</literal> in the row listing
         <literal>NDBCLUSTER</literal>; if you see <literal>NO</literal>
@@ -9854,8 +9853,8 @@
           Cluster is supported in the MySQL-max binaries from version
           4.1.3 onward. You can determine whether your server binary has
           <literal>NDB</literal> support using either of the commands
-          <literal>SHOW VARIABLES LIKE 'have_%';</literal> or
-          <literal>SHOW ENGINES;</literal>. (See
+          <literal>SHOW VARIABLES LIKE 'have_%'</literal> or
+          <literal>SHOW ENGINES</literal>. (See
           <xref linkend="mysqld-max"/>, for more information.)
         </para>
 

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-31 16:59:22 UTC (rev 1151)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-31 18:19:58 UTC (rev 1152)
@@ -1452,10 +1452,10 @@
             <xref linkend="mysql-cluster-limitations"/>.) This means
             that, once the <literal>world</literal> database and its
             tables have been created on one data node, you need to issue
-            the statement <literal>CREATE SCHEMA world;</literal>,
-            (beginning with MySQL 5.0.2, you may use <command>CREATE
-            SCHEMA world;</command> instead), followed by <command>FLUSH
-            TABLES;</command> on each SQL node in the cluster. This will
+            the statement <literal>CREATE SCHEMA world</literal>,
+            (beginning with MySQL 5.0.2, you may use <literal>CREATE
+            SCHEMA world</literal> instead), followed by <literal>FLUSH
+            TABLES</literal> on each SQL node in the cluster. This will
             cause the node to recognize the database and read its table
             definitions.
           </para>
@@ -1481,7 +1481,7 @@
           <para>
             If you did not modify the <literal>ENGINE=</literal> clauses
             in the table definitions prior to importing the SQL script,
-            you should run the following commands at this point:
+            you should run the following statements at this point:
           </para>
 
 <programlisting>
@@ -2023,8 +2023,8 @@
 </programlisting>
 
       <para>
-        You can then use the <command>SHOW</command> command from within
-        the management client to obtain a report on the cluster's
+        You can then use the <command>SHOW</command> statement from
+        within the management client to obtain a report on the cluster's
         status:
       </para>
 
@@ -2873,7 +2873,7 @@
               will be the determining factor for the node group. Whether
               or not explicit assignments are made, they can be viewed
               in the output of the management client's
-              <literal>SHOW</literal> command.
+              <literal>SHOW</literal> statement.
             </para>
 
             <para>
@@ -3751,16 +3751,16 @@
             <para>
               When setting <literal>MaxNoOfAttributes</literal>, it is
               important to prepare in advance for any <literal>ALTER
-              TABLE</literal> commands that you might wish to perform in
-              future. This is due to the fact, during the execution of
-              <literal>ALTER TABLE</literal> on a Cluster table, 3 times
-              the number of attributes as in the original table are
-              used. For example, if a table requires 100 attributes, and
-              you wish to be able to alter it later, then you need to
-              set the value of <literal>MaxNoOfAttributes</literal> to
-              300. A good rule of thumb is that, if you can create all
-              desired tables without any problems, then add 2 times the
-              number of attributes in the largest table to
+              TABLE</literal> statements that you might wish to perform
+              in future. This is due to the fact, during the execution
+              of <literal>ALTER TABLE</literal> on a Cluster table, 3
+              times the number of attributes as in the original table
+              are used. For example, if a table requires 100 attributes,
+              and you wish to be able to alter it later, then you need
+              to set the value of <literal>MaxNoOfAttributes</literal>
+              to 300. A good rule of thumb is that, if you can create
+              all desired tables without any problems, then add 2 times
+              the number of attributes in the largest table to
               <literal>MaxNoOfAttributes</literal> to be sure. You
               should also verify that this number is sufficient by
               trying an actual <literal>ALTER TABLE</literal> after
@@ -5513,7 +5513,7 @@
       <para>
         An easy way to verify that your server is running with the
         <literal>NDB Cluster</literal> storage engine enabled is to
-        issue the command <literal>SHOW ENGINES</literal> in the MySQL
+        issue the <literal>SHOW ENGINES</literal> statement in the MySQL
         Monitor (<command>mysql</command>). You should see the value
         <literal>YES</literal> in the row listing
         <literal>NDBCLUSTER</literal>; if you see <literal>NO</literal>
@@ -9578,7 +9578,7 @@
             than data transport.) Please note that this feature is
             disabled by default, but it should work in most cases. This
             feature can be enabled through the use of the <literal>SET
-            engine_condition_pushdown=On;</literal> statement.
+            engine_condition_pushdown=On</literal> statement.
             Alternatively, you can run <command>mysqld</command> with
             this feature enabled by starting the MySQL server with the
             <option>--engine-condition-pushdown</option> option.
@@ -10131,10 +10131,10 @@
           Cluster is supported in all MySQL-max binaries in the
           &current-series; release series, except as noted in the
           following paragraph. You can determine whether your server has
-          NDB support using either of the commands <literal>SHOW
-          VARIABLES LIKE 'have_%';</literal> or <literal>SHOW
-          ENGINES;</literal>. (See <xref linkend="mysqld-max"/>, for
-          more information.)
+          NDB support using either the <literal>SHOW VARIABLES LIKE
+          'have_%'</literal> or <literal>SHOW ENGINES</literal>
+          statement. (See <xref linkend="mysqld-max"/>, for more
+          information.)
         </para>
 
         <para>

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-31 16:59:22 UTC (rev 1151)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-31 18:19:58 UTC (rev 1152)
@@ -1479,7 +1479,7 @@
           <para>
             If you did not modify the <literal>ENGINE=</literal> clauses
             in the table definitions prior to importing the SQL script,
-            you should run the following commands at this point:
+            you should run the following statements at this point:
           </para>
 
 <programlisting>
@@ -2021,8 +2021,8 @@
 </programlisting>
 
       <para>
-        You can then use the <command>SHOW</command> command from within
-        the management client to obtain a report on the cluster's
+        You can then use the <command>SHOW</command> statement from
+        within the management client to obtain a report on the cluster's
         status:
       </para>
 
@@ -2871,7 +2871,7 @@
               will be the determining factor for the node group. Whether
               or not explicit assignments are made, they can be viewed
               in the output of the management client's
-              <literal>SHOW</literal> command.
+              <literal>SHOW</literal> statement.
             </para>
 
             <para>
@@ -3749,16 +3749,16 @@
             <para>
               When setting <literal>MaxNoOfAttributes</literal>, it is
               important to prepare in advance for any <literal>ALTER
-              TABLE</literal> commands that you might wish to perform in
-              future. This is due to the fact, during the execution of
-              <literal>ALTER TABLE</literal> on a Cluster table, 3 times
-              the number of attributes as in the original table are
-              used. For example, if a table requires 100 attributes, and
-              you wish to be able to alter it later, then you need to
-              set the value of <literal>MaxNoOfAttributes</literal> to
-              300. A good rule of thumb is that, if you can create all
-              desired tables without any problems, then add 2 times the
-              number of attributes in the largest table to
+              TABLE</literal> statements that you might wish to perform
+              in future. This is due to the fact, during the execution
+              of <literal>ALTER TABLE</literal> on a Cluster table, 3
+              times the number of attributes as in the original table
+              are used. For example, if a table requires 100 attributes,
+              and you wish to be able to alter it later, then you need
+              to set the value of <literal>MaxNoOfAttributes</literal>
+              to 300. A good rule of thumb is that, if you can create
+              all desired tables without any problems, then add 2 times
+              the number of attributes in the largest table to
               <literal>MaxNoOfAttributes</literal> to be sure. You
               should also verify that this number is sufficient by
               trying an actual <literal>ALTER TABLE</literal> after
@@ -5511,7 +5511,7 @@
       <para>
         An easy way to verify that your server is running with the
         <literal>NDB Cluster</literal> storage engine enabled is to
-        issue the command <literal>SHOW ENGINES</literal> in the MySQL
+        issue the <literal>SHOW ENGINES</literal> statement in the MySQL
         Monitor (<command>mysql</command>). You should see the value
         <literal>YES</literal> in the row listing
         <literal>NDBCLUSTER</literal>; if you see <literal>NO</literal>
@@ -8462,7 +8462,7 @@
             restarted after using <command>ndb_restore</command> in order
             to discover and setup replication of <literal>NDB
               Cluster</literal> tables. Alternatively, you can issue a
-            <literal>SHOW TABLES</literal> command on all databases in the
+            <literal>SHOW TABLES</literal> statement on all databases in the
             cluster.
           </para>
           
@@ -8484,7 +8484,7 @@
             involving Cluster.) The MySQL servers involved in replication
             should in this case be replicated. After this, you should use
             the <literal>RESET MASTER</literal> and <literal>RESET
-              SLAVE</literal> commands to clear the invalid
+              SLAVE</literal> statements to clear the invalid
             <literal>binlog_index</literal> and
             <literal>apply_status</literal> tables. respectively.
           </para>
@@ -8592,7 +8592,7 @@
         binary log by querying the
         <literal>cluster_replication.binlog_index</literal> table directly
         on the master. This can be also be accomplished using the
-        <literal>SHOW BINLOG EVENTS</literal> command on either the
+        <literal>SHOW BINLOG EVENTS</literal> statement on either the
         replication master or slave MySQL servers.
       </para>
   
@@ -8639,7 +8639,7 @@
             <quote><literal>myslave</literal>,</quote> logging in from the
             host named <quote><literal>rep-slave</literal>,</quote> and
             using the password <quote><literal>53cr37</literal>,</quote>
-            you would use the following <literal>GRANT</literal> command:
+            you would use the following <literal>GRANT</literal> statement:
           </para>
   
   <programlisting>
@@ -8659,7 +8659,7 @@
           <para>
             Configure the slave to use the master. Using the MySQL
             Monitor, this can be accomplished with the <literal>CHANGE
-              MASTER TO</literal> command: 
+              MASTER TO</literal> statement: 
           </para>
         
   <programlisting>
@@ -8686,7 +8686,7 @@
             server whose hostname is
             <quote><literal>rep-master</literal>,</quote> using the
             replication slave account created in the previous step, you
-            would use the following command:
+            would use the following statement:
           </para>
         
   <programlisting>
@@ -8699,7 +8699,7 @@
         
           <para>
             (For a complete list of clauses that can be used with this
-            command, see <xref linkend="change-master-to"/>.)
+            statement, see <xref linkend="change-master-to"/>.)
           </para>
           
           <para>
@@ -8867,7 +8867,7 @@
             in the slave server's <filename>my.cnf</filename> file, unless
             you wish for replication to begin immediately. With the use of
             this option, the start of replication will be delayed until
-            the appropriate <literal>START SLAVE</literal> command has
+            the appropriate <literal>START SLAVE</literal> statement has
             been issued, as explained in Step 4 below.
           </para>
         </listitem>
@@ -8972,7 +8972,7 @@
         <command>mysqld</command> processes for the primary and secondary
         replication masters must be started, followed by those for the
         primary and secondary slaves. Then the replication processes may
-        be initiated by issuing the <literal>START SLAVE</literal> command
+        be initiated by issuing the <literal>START SLAVE</literal> statement
         on each of the slaves. The commands and the order in which they
         need to be issued are shown here:
       </para>
@@ -9025,7 +9025,7 @@
         <listitem>
           <para>
             Finally, commence replication on the primary channel by
-            executing the <literal>START SLAVE</literal> command on the
+            executing the <literal>START SLAVE</literal> statement on the
             primary slave as shown here:
           </para>
           
@@ -9290,7 +9290,7 @@
             Create any databases on the slave cluster that are present on
             the master cluster that are to be replicated to the slave.
             <emphasis role="bold">Important</emphasis>: A <literal>CREATE
-              SCHEMA</literal> command corresponding to each database to
+              SCHEMA</literal> statement corresponding to each database to
             be replicated must be executed on each data node in the slave 
             cluster.
           </para>
@@ -9298,7 +9298,7 @@
         
         <listitem>
           <para>
-            Reset the slave cluster using this command in the MySQL
+            Reset the slave cluster using this statement in the MySQL
             Monitor:
           </para>
           
@@ -9310,7 +9310,7 @@
             It is important that you make sure that the slave's
             apply_status table does not contain any records prior to
             running the restore process. You can accomplish this by
-            running this SQL command on the slave: 
+            running this SQL statement on the slave: 
           </para>
           
   <programlisting>
@@ -9389,7 +9389,7 @@
             database which was backed up and restored. Where multiple
             databases have been backed up and then restored, it is
             necessary  to issue the <literal>USE</literal> and
-            <literal>SHOW</literal> commands for each database in turn.
+            <literal>SHOW</literal> statements for each database in turn.
             Note also that these commands must be issued on each host
             acting as a data node in the slave cluster. 
           </para>
@@ -9433,7 +9433,7 @@
           <para>
             Using the values obtained in the previous step, you can now
             issue the appropriate <literal>CHANGE MASTER TO</literal>
-            command in the slave's <command>mysql</command> client:
+            statement in the slave's <command>mysql</command> client:
           </para>
           
   <programlisting>
@@ -9448,7 +9448,7 @@
             Now that the slave <quote>knows</quote> from what point in
             which <literal>binlog</literal> file to start reading data
             from the master, you can cause the slave to begin replicating
-            with this standard MySQL command:
+            with this standard MySQL statement:
           </para>
           
   <programlisting>
@@ -9462,7 +9462,7 @@
         channel, it is necessary only to repeat these steps, substituting
         the hostnames and IDs of the secondary master and slave for those
         of the primary master and slave replication servers where
-        appropriate, and running the preceding commands on them. 
+        appropriate, and running the preceding statements on them. 
       </para>
       
       <para>
@@ -9676,7 +9676,7 @@
           altered using <literal>ALTER TABLE</literal>, the cluster must
           be made aware of the change. When a database is created or
           dropped, the appropriate <literal>CREATE SCHEMA</literal> or
-          <literal>DROP SCHEMA</literal> command should be issued on each
+          <literal>DROP SCHEMA</literal> statement should be issued on each
           storage node in the cluster in order induce discovery of the
           change, that is:
         </para>
@@ -9791,7 +9791,7 @@
           
           <listitem>
             <para>
-              Issue any desired <literal>ALTER TABLE</literal> commands
+              Issue any desired <literal>ALTER TABLE</literal> statements
               that add or remove columns to or from an existing table,
               for example:
             </para>
@@ -9806,7 +9806,7 @@
               Force all slave SQL nodes to become aware of the changed
               table definition. The recommended way to do this is by
               issuing a <quote>throwaway</quote> <literal>SHOW
-                TABLES</literal> command on each slave
+                TABLES</literal> statement on each slave
               <command>mysqld</command>:
             </para>
             
@@ -11746,10 +11746,10 @@
           Cluster is supported in all MySQL-max binaries in the
           &current-series; release series, except as noted in the
           following paragraph. You can determine whether your server has
-          NDB support using either of the commands <literal>SHOW
-          VARIABLES LIKE 'have_%';</literal> or <literal>SHOW
-          ENGINES;</literal>. (See <xref linkend="mysqld-max"/>, for
-          more information.)
+          NDB support using either the <literal>SHOW VARIABLES LIKE
+          'have_%'</literal> or <literal>SHOW ENGINES</literal>
+          statement. (See <xref linkend="mysqld-max"/>, for more
+          information.)
         </para>
 
         <para>

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