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

[paul]

Author: paul
Date: 2005-11-03 17:05:34 +0100 (Thu, 03 Nov 2005)
New Revision: 233

Log:
 r278@kite-hub:  paul | 2005-11-03 10:04:52 -0600
 DESCRIBE Null column is YES/NO in 5.0, not YES/empty.


Modified:
   trunk/
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2005-11-03 05:24:57 UTC (rev 232)
+++ trunk/refman-5.0/sql-syntax.xml	2005-11-03 16:05:34 UTC (rev 233)
@@ -9469,20 +9469,18 @@
 +------------+----------+------+-----+---------+----------------+
 | Field      | Type     | Null | Key | Default | Extra          |
 +------------+----------+------+-----+---------+----------------+
-| Id         | int(11)  |      | PRI | NULL    | auto_increment |
-| Name       | char(35) |      |     |         |                |
-| Country    | char(3)  |      | UNI |         |                |
+| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |
+| Name       | char(35) | NO   |     |         |                |
+| Country    | char(3)  | NO   | UNI |         |                |
 | District   | char(20) | YES  | MUL |         |                |
-| Population | int(11)  |      |     | 0       |                |
+| Population | int(11)  | NO   |     | 0       |                |
 +------------+----------+------+-----+---------+----------------+
 5 rows in set (0.00 sec)
 </programlisting>
 
       <para>
         The <literal>Null</literal> field indicates whether
-        <literal>NULL</literal> values can be stored in the column, with
-        <literal>YES</literal> displayed when
<literal>NULL</literal>
-        values are allowed.
+        <literal>NULL</literal> values can be stored in the column.
       </para>
 
       <para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2005-11-03 05:24:57 UTC (rev 232)
+++ trunk/refman-5.1/sql-syntax.xml	2005-11-03 16:05:34 UTC (rev 233)
@@ -10047,20 +10047,18 @@
 +------------+----------+------+-----+---------+----------------+
 | Field      | Type     | Null | Key | Default | Extra          |
 +------------+----------+------+-----+---------+----------------+
-| Id         | int(11)  |      | PRI | NULL    | auto_increment |
-| Name       | char(35) |      |     |         |                |
-| Country    | char(3)  |      | UNI |         |                |
+| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |
+| Name       | char(35) | NO   |     |         |                |
+| Country    | char(3)  | NO   | UNI |         |                |
 | District   | char(20) | YES  | MUL |         |                |
-| Population | int(11)  |      |     | 0       |                |
+| Population | int(11)  | NO   |     | 0       |                |
 +------------+----------+------+-----+---------+----------------+
 5 rows in set (0.00 sec)
 </programlisting>
 
       <para>
         The <literal>Null</literal> field indicates whether
-        <literal>NULL</literal> values can be stored in the column, with
-        <literal>YES</literal> displayed when
<literal>NULL</literal>
-        values are allowed.
+        <literal>NULL</literal> values can be stored in the column.
       </para>
 
       <para>