Author: paul
Date: 2006-04-10 17:28:44 +0200 (Mon, 10 Apr 2006)
New Revision: 1773
Log:
r9328@frost: paul | 2006-04-10 09:20:01 -0500
Minor revisions.
Modified:
trunk/
trunk/refman-4.1/language-structure.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/language-structure.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9326
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4334
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9328
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4334
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-4.1/language-structure.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -906,11 +906,10 @@
</programlisting>
<para>
- Note: Because <literal>ANSI_QUOTES</literal> causes the server to
- interpret double-quoted strings as identifiers, string literals
- must be enclosed within single quotes. They cannot be enclosed
- within double quotes when <literal>ANSI_QUOTES</literal> is
- enabled.
+ Note: Because the <literal>ANSI_QUOTES</literal> mode causes the
+ server to interpret double-quoted strings as identifiers, string
+ literals must be enclosed within single quotes when this mode is
+ enabled. They cannot be enclosed within double quotes.
</para>
<para>
@@ -976,10 +975,12 @@
It is recommended that you do not use names of the form
<literal><replaceable>M</replaceable>e</literal> or
<literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
- such as <literal>1e</literal> or <literal>2e2</literal>,
because
- an expression such as <literal>1e+3</literal> is ambiguous.
- Depending on context, it might be interpreted as the expression
- <literal>1e + 3</literal> or as the number
+ where <replaceable>M</replaceable> and
+ <replaceable>N</replaceable> are integers. For example, avoid
+ using <literal>1e</literal> or <literal>2e2</literal> as
+ identifiers, because an expression such as <literal>1e+3</literal>
+ is ambiguous. Depending on context, it might be interpreted as the
+ expression <literal>1e + 3</literal> or as the number
<literal>1e+3</literal>.
</para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-4.1/sql-syntax.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -917,16 +917,15 @@
<para>
<literal>CREATE DATABASE</literal> creates a database with the
- given name. To use <literal>CREATE DATABASE</literal>, you need
- the <literal>CREATE</literal> privilege on the database.
+ given name. To use this statement, you need the
+ <literal>CREATE</literal> privilege for the database.
</para>
<remark role="help-description-end"/>
<para>
- Rules for allowable database names are given in
- <xref linkend="legal-names"/>. An error occurs if the database
- exists and you did not specify <literal>IF NOT EXISTS</literal>.
+ An error occurs if the database exists and you did not specify
+ <literal>IF NOT EXISTS</literal>.
</para>
<para>
@@ -942,12 +941,14 @@
</para>
<para>
- Databases in MySQL are implemented as directories containing
+ A database in MySQL is implemented as a directory containing
files that correspond to tables in the database. Because there
are no tables in a database when it is initially created, the
<literal>CREATE DATABASE</literal> statement only creates a
directory under the MySQL data directory (and the
- <filename>db.opt</filename> file, for MySQL 4.1.1 and up).
+ <filename>db.opt</filename> file, for MySQL 4.1.1 and up). Rules
+ for allowable database names are given in
+ <xref linkend="legal-names"/>.
</para>
<para>
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-5.0/language-structure.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -931,11 +931,10 @@
</programlisting>
<para>
- Note: Because <literal>ANSI_QUOTES</literal> causes the server to
- interpret double-quoted strings as identifiers, string literals
- must be enclosed within single quotes. They cannot be enclosed
- within double quotes when <literal>ANSI_QUOTES</literal> is
- enabled.
+ Note: Because the <literal>ANSI_QUOTES</literal> mode causes the
+ server to interpret double-quoted strings as identifiers, string
+ literals must be enclosed within single quotes when this mode is
+ enabled. They cannot be enclosed within double quotes.
</para>
<para>
@@ -961,10 +960,12 @@
It is recommended that you do not use names of the form
<literal><replaceable>M</replaceable>e</literal> or
<literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
- such as <literal>1e</literal> or <literal>2e2</literal>,
because
- an expression such as <literal>1e+3</literal> is ambiguous.
- Depending on context, it might be interpreted as the expression
- <literal>1e + 3</literal> or as the number
+ where <replaceable>M</replaceable> and
+ <replaceable>N</replaceable> are integers. For example, avoid
+ using <literal>1e</literal> or <literal>2e2</literal> as
+ identifiers, because an expression such as <literal>1e+3</literal>
+ is ambiguous. Depending on context, it might be interpreted as the
+ expression <literal>1e + 3</literal> or as the number
<literal>1e+3</literal>.
</para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-5.0/sql-syntax.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -944,8 +944,8 @@
<para>
<literal>CREATE DATABASE</literal> creates a database with the
- given name. To use <literal>CREATE DATABASE</literal>, you need
- the <literal>CREATE</literal> privilege on the database.
+ given name. To use this statement, you need the
+ <literal>CREATE</literal> privilege for the database.
<literal>CREATE SCHEMA</literal> is a synonym for
<literal>CREATE DATABASE</literal> as of MySQL 5.0.2.
</para>
@@ -953,9 +953,8 @@
<remark role="help-description-end"/>
<para>
- Rules for allowable database names are given in
- <xref linkend="legal-names"/>. An error occurs if the database
- exists and you did not specify <literal>IF NOT EXISTS</literal>.
+ An error occurs if the database exists and you did not specify
+ <literal>IF NOT EXISTS</literal>.
</para>
<para>
@@ -970,12 +969,13 @@
</para>
<para>
- Databases in MySQL are implemented as directories containing
+ A database in MySQL is implemented as a directory containing
files that correspond to tables in the database. Because there
are no tables in a database when it is initially created, the
<literal>CREATE DATABASE</literal> statement creates only a
directory under the MySQL data directory and the
- <filename>db.opt</filename> file.
+ <filename>db.opt</filename> file. Rules for allowable database
+ names are given in <xref linkend="legal-names"/>.
</para>
<para>
Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-5.1/language-structure.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -931,11 +931,10 @@
</programlisting>
<para>
- Note: Because <literal>ANSI_QUOTES</literal> causes the server to
- interpret double-quoted strings as identifiers, string literals
- must be enclosed within single quotes. They cannot be enclosed
- within double quotes when <literal>ANSI_QUOTES</literal> is
- enabled.
+ Note: Because the <literal>ANSI_QUOTES</literal> mode causes the
+ server to interpret double-quoted strings as identifiers, string
+ literals must be enclosed within single quotes when this mode is
+ enabled. They cannot be enclosed within double quotes.
</para>
<para>
@@ -961,10 +960,12 @@
It is recommended that you do not use names of the form
<literal><replaceable>M</replaceable>e</literal> or
<literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
- such as <literal>1e</literal> or <literal>2e2</literal>,
because
- an expression such as <literal>1e+3</literal> is ambiguous.
- Depending on context, it might be interpreted as the expression
- <literal>1e + 3</literal> or as the number
+ where <replaceable>M</replaceable> and
+ <replaceable>N</replaceable> are integers. For example, avoid
+ using <literal>1e</literal> or <literal>2e2</literal> as
+ identifiers, because an expression such as <literal>1e+3</literal>
+ is ambiguous. Depending on context, it might be interpreted as the
+ expression <literal>1e + 3</literal> or as the number
<literal>1e+3</literal>.
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-04-10 14:46:58 UTC (rev 1772)
+++ trunk/refman-5.1/sql-syntax.xml 2006-04-10 15:28:44 UTC (rev 1773)
@@ -1405,8 +1405,8 @@
<para>
<literal>CREATE DATABASE</literal> creates a database with the
- given name. To use <literal>CREATE DATABASE</literal>, you need
- the <literal>CREATE</literal> privilege on the database.
+ given name. To use this statement, you need the
+ <literal>CREATE</literal> privilege for the database.
<literal>CREATE SCHEMA</literal> is a synonym for
<literal>CREATE DATABASE</literal>.
</para>
@@ -1414,9 +1414,8 @@
<remark role="help-description-end"/>
<para>
- Rules for allowable database names are given in
- <xref linkend="legal-names"/>. An error occurs if the database
- exists and you did not specify <literal>IF NOT EXISTS</literal>.
+ An error occurs if the database exists and you did not specify
+ <literal>IF NOT EXISTS</literal>.
</para>
<para>
@@ -1431,12 +1430,13 @@
</para>
<para>
- Databases in MySQL are implemented as directories containing
+ A database in MySQL is implemented as a directory containing
files that correspond to tables in the database. Because there
are no tables in a database when it is initially created, the
<literal>CREATE DATABASE</literal> statement creates only a
directory under the MySQL data directory and the
- <filename>db.opt</filename> file.
+ <filename>db.opt</filename> file. Rules for allowable database
+ names are given in <xref linkend="legal-names"/>.
</para>
<para>
@@ -17748,8 +17748,10 @@
<remark role="help-description-end"/>
<para>
- <literal>SHOW PLUGIN</literal> was added in MySQL 5.1.5 and renamed
-to <literal>SHOW PLUGINS</literal> in 5.1.9. (As of 5.1.9,
<literal>SHOW PLUGIN</literal> is deprecated and generates a warning.)
+ <literal>SHOW PLUGIN</literal> was added in MySQL 5.1.5 and
+ renamed to <literal>SHOW PLUGINS</literal> in 5.1.9. (As of
+ 5.1.9, <literal>SHOW PLUGIN</literal> is deprecated and
+ generates a warning.)
</para>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1773 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 Apr |