svn commit - mysqldoc@docsrva: r8340 - in trunk: . refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-10-26 18:28:57 +0200 (Fri, 26 Oct 2007)
New Revision: 8340

Log:
 r26214@frost:  paul | 2007-10-26 11:05:39 -0500
 Add note that users shouldn't use the #mysql50# prefix in names.
 Other minor wording changes.


Modified:
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.2/language-structure.xml

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


Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2007-10-26 11:46:37 UTC (rev 8339)
+++ trunk/refman-5.1/language-structure.xml	2007-10-26 16:28:57 UTC (rev 8340)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 3; 1838 bytes

@@ -963,8 +963,8 @@
       <xref linkend="identifier-mapping"/>. If you have databases or
       tables from an older version of MySQL that contain special
       characters and for which the underlying directory names or
-      filenames have not been updated to use the new encoding, you will
-      see their names displayed with a prefix of
+      filenames have not been updated to use the new encoding, the
+      server displays their names with a prefix of
       <literal>#mysql50#</literal>. For information about referring to
       such names or converting them to the newer encoding, see that
       section.

@@ -1553,7 +1553,7 @@
         If you have databases or tables from a version of MySQL older
         than 5.1.6 that contain special characters and for which the
         underlying directory names or filenames have not been updated to
-        use the new encoding, you will see their names displayed with a
+        use the new encoding, the server displays their names with a
         prefix of <literal>#mysql50#</literal> in the output from
         <literal>INFORMATION_SCHEMA</literal> tables or
         <literal>SHOW</literal> statements. For example, if you have a

@@ -1608,6 +1608,14 @@
         <xref linkend="mysqlcheck"/>.
       </para>
 
+      <note>
+        <para>
+          The <literal>#mysql50#</literal> prefix is intended only to be
+          used internally by the server. You should not create databases
+          or tables with names that use this prefix.
+        </para>
+      </note>
+
     </section>
 
     <section id="function-resolution">


Modified: trunk/refman-5.2/language-structure.xml
===================================================================
--- trunk/refman-5.2/language-structure.xml	2007-10-26 11:46:37 UTC (rev 8339)
+++ trunk/refman-5.2/language-structure.xml	2007-10-26 16:28:57 UTC (rev 8340)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 3; 1838 bytes

@@ -963,8 +963,8 @@
       <xref linkend="identifier-mapping"/>. If you have databases or
       tables from an older version of MySQL that contain special
       characters and for which the underlying directory names or
-      filenames have not been updated to use the new encoding, you will
-      see their names displayed with a prefix of
+      filenames have not been updated to use the new encoding, the
+      server displays their names with a prefix of
       <literal>#mysql50#</literal>. For information about referring to
       such names or converting them to the newer encoding, see that
       section.

@@ -1553,7 +1553,7 @@
         If you have databases or tables from a version of MySQL older
         than 5.1.6 that contain special characters and for which the
         underlying directory names or filenames have not been updated to
-        use the new encoding, you will see their names displayed with a
+        use the new encoding, the server displays their names with a
         prefix of <literal>#mysql50#</literal> in the output from
         <literal>INFORMATION_SCHEMA</literal> tables or
         <literal>SHOW</literal> statements. For example, if you have a

@@ -1608,6 +1608,14 @@
         <xref linkend="mysqlcheck"/>.
       </para>
 
+      <note>
+        <para>
+          The <literal>#mysql50#</literal> prefix is intended only to be
+          used internally by the server. You should not create databases
+          or tables with names that use this prefix.
+        </para>
+      </note>
+
     </section>
 
     <section id="function-resolution">