svn commit - mysqldoc@docsrva: r999 - in trunk: . refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-01-23 22:25:22 +0100 (Mon, 23 Jan 2006)
New Revision: 999

Log:
 r2442@kite-hub:  paul | 2006-01-23 12:15:46 -0600
 Fix/add markup to some examples.


Modified:
   trunk/
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/replication.xml


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

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-23 21:24:58 UTC (rev 998)
+++ trunk/refman-5.0/database-administration.xml	2006-01-23 21:25:22 UTC (rev 999)
@@ -3236,44 +3236,45 @@
                 </para>
 
 <programlisting>
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 1     |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 1     |
+| auto_increment_offset    | 1     |
++--------------------------+-------+
+2 rows in set (0.00 sec)
 
-  mysql&gt; CREATE TABLE autoinc1 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+mysql&gt; <userinput>CREATE TABLE autoinc1</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
   Query OK, 0 rows affected (0.04 sec)
 
-  mysql&gt; SET @auto_increment_increment=10;
-  Query OK, 0 rows affected (0.00 sec)
+mysql&gt; <userinput>SET @@auto_increment_increment=10;</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.01 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 10    |
+| auto_increment_offset    | 1     |
++--------------------------+-------+
+2 rows in set (0.01 sec)
 
-  mysql&gt; INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
+mysql&gt; <userinput>INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>
+Query OK, 4 rows affected (0.00 sec)
+Records: 4  Duplicates: 0  Warnings: 0
 
-  mysql&gt; SELECT col FROM autoinc1;
-  +-----+
-  | col |
-  +-----+
-  |   1 |
-  |  11 |
-  |  21 |
-  |  31 |
-  +-----+
-  4 rows in set (0.00 sec)
+mysql&gt; <userinput>SELECT col FROM autoinc1;</userinput>
++-----+
+| col |
++-----+
+|   1 |
+|  11 |
+|  21 |
+|  31 |
++-----+
+4 rows in set (0.00 sec)
 </programlisting>
 
                 <para>
@@ -3294,36 +3295,36 @@
                 </para>
 
 <programlisting>
-  mysql&gt; SET @auto_increment_offset=5;
-  Query OK, 0 rows affected (0.00 sec)
+mysql&gt; <userinput>SET @@auto_increment_offset=5;</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 5     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 10    |
+| auto_increment_offset    | 5     |
++--------------------------+-------+
+2 rows in set (0.00 sec)
 
-  mysql&gt; CREATE TABLE autoinc2 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
-  Query OK, 0 rows affected (0.06 sec)
+mysql&gt; <userinput>CREATE TABLE autoinc2</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+Query OK, 0 rows affected (0.06 sec)
 
-  mysql&gt; INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
+mysql&gt; <userinput>INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>
+Query OK, 4 rows affected (0.00 sec)
+Records: 4  Duplicates: 0  Warnings: 0
 
-  mysql&gt; SELECT col FROM autoinc2;
-  +-----+
-  | col |
-  +-----+
-  |   5 |
-  |  15 |
-  |  25 |
-  |  35 |
-  +-----+
-  4 rows in set (0.02 sec)
-
+mysql&gt; <userinput>SELECT col FROM autoinc2;</userinput>
++-----+
+| col |
++-----+
+|   5 |
+|  15 |
+|  25 |
+|  35 |
++-----+
+4 rows in set (0.02 sec)
 </programlisting>
 
                 <para>
@@ -14963,9 +14964,9 @@
 
       <para>
         Naturally, you should always test your entries in the grant
-        tables (for example, by using <literal>SHOW GRANTS</literal> or
-        <command>mysqlaccess</command>) to make sure that your access
-        privileges are actually set up the way you think they are.
+        tables (for example, by using <literal>SHOW GRANTS</literal>) to
+        make sure that your access privileges are actually set up the
+        way you think they are.
       </para>
 
     </section>

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-23 21:24:58 UTC (rev 998)
+++ trunk/refman-5.0/replication.xml	2006-01-23 21:25:22 UTC (rev 999)
@@ -4356,10 +4356,11 @@
 +--------------------------+-------+
 2 rows in set (0.00 sec)
 
-mysql&gt; <userinput>CREATE TABLE autoinc1 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+mysql&gt; <userinput>CREATE TABLE autoinc1</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
 Query OK, 0 rows affected (0.04 sec)
 
-mysql&gt; <userinput>SET @auto_increment_increment=10;</userinput>
+mysql&gt; <userinput>SET @@auto_increment_increment=10;</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
@@ -4408,7 +4409,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET @auto_increment_offset=5;</userinput>
+mysql&gt; <userinput>SET @@auto_increment_offset=5;</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
@@ -4420,7 +4421,8 @@
 +--------------------------+-------+
 2 rows in set (0.00 sec)
 
-mysql&gt; <userinput>CREATE TABLE autoinc2 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+mysql&gt; <userinput>CREATE TABLE autoinc2</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
 Query OK, 0 rows affected (0.06 sec)
 
 mysql&gt; <userinput>INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-23 21:24:58 UTC (rev 998)
+++ trunk/refman-5.1/database-administration.xml	2006-01-23 21:25:22 UTC (rev 999)
@@ -3215,44 +3215,45 @@
                 </para>
 
 <programlisting>
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 1     |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 1     |
+| auto_increment_offset    | 1     |
++--------------------------+-------+
+2 rows in set (0.00 sec)
 
-  mysql&gt; CREATE TABLE autoinc1 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+mysql&gt; <userinput>CREATE TABLE autoinc1</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
   Query OK, 0 rows affected (0.04 sec)
 
-  mysql&gt; SET @auto_increment_increment=10;
-  Query OK, 0 rows affected (0.00 sec)
+mysql&gt; <userinput>SET @@auto_increment_increment=10;</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.01 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 10    |
+| auto_increment_offset    | 1     |
++--------------------------+-------+
+2 rows in set (0.01 sec)
 
-  mysql&gt; INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
+mysql&gt; <userinput>INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>
+Query OK, 4 rows affected (0.00 sec)
+Records: 4  Duplicates: 0  Warnings: 0
 
-  mysql&gt; SELECT col FROM autoinc1;
-  +-----+
-  | col |
-  +-----+
-  |   1 |
-  |  11 |
-  |  21 |
-  |  31 |
-  +-----+
-  4 rows in set (0.00 sec)
+mysql&gt; <userinput>SELECT col FROM autoinc1;</userinput>
++-----+
+| col |
++-----+
+|   1 |
+|  11 |
+|  21 |
+|  31 |
++-----+
+4 rows in set (0.00 sec)
 </programlisting>
 
                 <para>
@@ -3273,36 +3274,36 @@
                 </para>
 
 <programlisting>
-  mysql&gt; SET @auto_increment_offset=5;
-  Query OK, 0 rows affected (0.00 sec)
+mysql&gt; <userinput>SET @@auto_increment_offset=5;</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 5     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
++--------------------------+-------+
+| Variable_name            | Value |
++--------------------------+-------+
+| auto_increment_increment | 10    |
+| auto_increment_offset    | 5     |
++--------------------------+-------+
+2 rows in set (0.00 sec)
 
-  mysql&gt; CREATE TABLE autoinc2 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
-  Query OK, 0 rows affected (0.06 sec)
+mysql&gt; <userinput>CREATE TABLE autoinc2</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+Query OK, 0 rows affected (0.06 sec)
 
-  mysql&gt; INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
+mysql&gt; <userinput>INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>
+Query OK, 4 rows affected (0.00 sec)
+Records: 4  Duplicates: 0  Warnings: 0
 
-  mysql&gt; SELECT col FROM autoinc2;
-  +-----+
-  | col |
-  +-----+
-  |   5 |
-  |  15 |
-  |  25 |
-  |  35 |
-  +-----+
-  4 rows in set (0.02 sec)
-
+mysql&gt; <userinput>SELECT col FROM autoinc2;</userinput>
++-----+
+| col |
++-----+
+|   5 |
+|  15 |
+|  25 |
+|  35 |
++-----+
+4 rows in set (0.02 sec)
 </programlisting>
 
                 <para>
@@ -14978,9 +14979,9 @@
 
       <para>
         Naturally, you should always test your entries in the grant
-        tables (for example, by using <literal>SHOW GRANTS</literal> or
-        <command>mysqlaccess</command>) to make sure that your access
-        privileges are actually set up the way you think they are.
+        tables (for example, by using <literal>SHOW GRANTS</literal>) to
+        make sure that your access privileges are actually set up the
+        way you think they are.
       </para>
 
     </section>

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-23 21:24:58 UTC (rev 998)
+++ trunk/refman-5.1/replication.xml	2006-01-23 21:25:22 UTC (rev 999)
@@ -4884,10 +4884,11 @@
 +--------------------------+-------+
 2 rows in set (0.00 sec)
 
-mysql&gt; <userinput>CREATE TABLE autoinc1 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+mysql&gt; <userinput>CREATE TABLE autoinc1</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
 Query OK, 0 rows affected (0.04 sec)
 
-mysql&gt; <userinput>SET @auto_increment_increment=10;</userinput>
+mysql&gt; <userinput>SET @@auto_increment_increment=10;</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
@@ -4936,7 +4937,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>SET @auto_increment_offset=5;</userinput>
+mysql&gt; <userinput>SET @@auto_increment_offset=5;</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>SHOW VARIABLES LIKE 'auto_inc%';</userinput>
@@ -4948,7 +4949,8 @@
 +--------------------------+-------+
 2 rows in set (0.00 sec)
 
-mysql&gt; <userinput>CREATE TABLE autoinc2 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
+mysql&gt; <userinput>CREATE TABLE autoinc2</userinput>
+    -&gt; <userinput>(col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);</userinput>
 Query OK, 0 rows affected (0.06 sec)
 
 mysql&gt; <userinput>INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);</userinput>