Author: paul
Date: 2006-03-23 05:50:02 +0100 (Thu, 23 Mar 2006)
New Revision: 1647
Log:
r8903@frost: paul | 2006-03-22 22:49:42 -0600
Fold in proof corrections.
Modified:
trunk/
trunk/refman-4.1/language-structure.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.1/language-structure.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8898
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4044
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8903
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4044
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2006-03-23 04:08:25 UTC (rev 1646)
+++ trunk/refman-4.1/language-structure.xml 2006-03-23 04:50:02 UTC (rev 1647)
@@ -107,8 +107,8 @@
<para>
If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
- string literals can be quoted only within single quotes. A
- string quoted within double quotes is interpreted as an
+ string literals can be quoted only within single quotes because
+ a string quoted within double quotes is interpreted as an
identifier.
</para>
@@ -120,7 +120,8 @@
types of strings, comparisons are based on the numeric values of
the string unit. For binary strings, the unit is the byte. For
non-binary strings the unit is the character and some character
- sets allow multi-byte characters.
+ sets allow multi-byte characters. Character value ordering is a
+ function of the string collation.
</para>
<para>
@@ -324,6 +325,13 @@
</informaltable>
<para>
+ For all other escape sequences, backslash is ignored. That is,
+ the escaped character is interpreted as if it was not escaped.
+ For example, ‘<literal>\x</literal>’ is just
+ ‘<literal>x</literal>’.
+ </para>
+
+ <para>
These sequences are case sensitive. For example,
‘<literal>\b</literal>’ is interpreted as a
backspace, but ‘<literal>\B</literal>’ is
@@ -356,13 +364,6 @@
‘<literal>_</literal>’.
</para>
- <para>
- For all other escape sequences, backslash is ignored. That is,
- the escaped character is interpreted as if it was not escaped.
- For example, ‘<literal>\x</literal>’ is just
- ‘<literal>x</literal>’.
- </para>
-
<indexterm>
<primary>quotes</primary>
<secondary>in strings</secondary>
@@ -1060,8 +1061,9 @@
table <literal>t</literal> in database <literal>db1</literal>
and from a table <literal>t</literal> in database
<literal>db2</literal> in the same statement, you must refer to
- columns in those tables as <literal>db1.t.col_name</literal> and
- <literal>db2.t.col_name</literal>.
+ columns in those tables as
+ <literal>db1.t.<replaceable>col_name</replaceable></literal> and
+ <literal>db2.t.<replaceable>col_name</replaceable></literal>.
</para>
<para>
@@ -1404,8 +1406,8 @@
<para>
Beginning with MySQL 4.1.1, if a user variable is assigned a
- string value, it also has the same character set and collation as
- the string. The coercibility of user variables is
+ string value, it has the same character set and collation as the
+ string. The coercibility of user variables is
<quote>implicit</quote> as of MySQL 4.1.11 and 5.0.3. (This is the
same coercibility as table column values.)
</para>
@@ -1504,13 +1506,14 @@
<listitem>
<para>
- From a ‘<literal>-- </literal>’ sequence to the
- end of the line. This style is supported as of MySQL 3.23.3.
- In MySQL, the <squo;<literal>-- </literal>’
- (double-dash) comment style requires the second dash to be
- followed by at least one whitespace or control character (such
- as a space, tab, newline, and so on). This syntax differs
- slightly from standard SQL comment syntax, as discussed in
+ From a ‘<literal>-- </literal>’ sequence to
+ the end of the line. This style is supported as of MySQL
+ 3.23.3. In MySQL, the
+ <squo;<literal>-- </literal>’ (double-dash)
+ comment style requires the second dash to be followed by at
+ least one whitespace or control character (such as a space,
+ tab, newline, and so on). This syntax differs slightly from
+ standard SQL comment syntax, as discussed in
<xref linkend="ansi-diff-comments"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2006-03-23 04:08:25 UTC (rev 1646)
+++ trunk/refman-5.0/language-structure.xml 2006-03-23 04:50:02 UTC (rev 1647)
@@ -107,7 +107,7 @@
<para>
If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
- string literals can be quoted only within single quotes. A
+ string literals can be quoted only within single quotes because a
string quoted within double quotes is interpreted as an
identifier.
</para>
@@ -121,6 +121,7 @@
For binary strings, the unit is the byte. For non-binary strings
the unit is the character and some character sets allow
multi-byte characters.
+Character value ordering is a function of the string collation.
</para>
<para>
@@ -324,6 +325,13 @@
</informaltable>
<para>
+ For all other escape sequences, backslash is ignored. That is,
+ the escaped character is interpreted as if it was not escaped.
+ For example, ‘<literal>\x</literal>’ is just
+ ‘<literal>x</literal>’.
+ </para>
+
+ <para>
These sequences are case sensitive. For example,
‘<literal>\b</literal>’ is interpreted as a
backspace, but ‘<literal>\B</literal>’ is
@@ -356,13 +364,6 @@
‘<literal>_</literal>’.
</para>
- <para>
- For all other escape sequences, backslash is ignored. That is,
- the escaped character is interpreted as if it was not escaped.
- For example, ‘<literal>\x</literal>’ is just
- ‘<literal>x</literal>’.
- </para>
-
<indexterm>
<primary>quotes</primary>
<secondary>in strings</secondary>
@@ -1044,8 +1045,8 @@
table <literal>t</literal> in database <literal>db1</literal>
and from a table <literal>t</literal> in database
<literal>db2</literal> in the same statement, you must refer to
- columns in those tables as <literal>db1.t.col_name</literal> and
- <literal>db2.t.col_name</literal>.
+ columns in those tables as <literal>db1.t.<replaceable>col_name</replaceable></literal> and
+ <literal>db2.t.<replaceable>col_name</replaceable></literal>.
</para>
<para>
@@ -1167,7 +1168,7 @@
<para>
However, this same statement is permitted on Windows. To avoid
- being caught out by such differences, it is best to adopt a
+ problems caused by such differences, it is best to adopt a
consistent convention, such as always creating and referring to
databases and tables using lowercase names. This convention is
recommended for maximum portability and ease of use.
@@ -1383,7 +1384,7 @@
</para>
<para>
- If a user variable is assigned a string value, it also has the
+ If a user variable is assigned a string value, it has the
same character set and collation as the string. The coercibility
of user variables is implicit as of MySQL 5.0.3. (This is the same
coercibility as for table column values.)
@@ -1488,9 +1489,8 @@
<listitem>
<para>
- From a ‘<literal>-- </literal>’ sequence to the
- end of the line. In MySQL, the ‘<literal>--
- </literal>’ (double-dash) comment style requires the
+ From a ‘<literal>-- </literal>’ sequence to the
+ end of the line. In MySQL, the ‘<literal>-- </literal>’ (double-dash) comment style requires the
second dash to be followed by at least one whitespace or
control character (such as a space, tab, newline, and so on).
This syntax differs slightly from standard SQL comment syntax,
Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml 2006-03-23 04:08:25 UTC (rev 1646)
+++ trunk/refman-5.1/language-structure.xml 2006-03-23 04:50:02 UTC (rev 1647)
@@ -107,8 +107,8 @@
<para>
If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
- string literals can be quoted only within single quotes. A
- string quoted within double quotes is interpreted as an
+ string literals can be quoted only within single quotes because
+ a string quoted within double quotes is interpreted as an
identifier.
</para>
@@ -120,7 +120,8 @@
comparisons are based on the numeric values of the string unit.
For binary strings, the unit is the byte. For non-binary strings
the unit is the character and some character sets allow
- multi-byte characters.
+ multi-byte characters. Character value ordering is a function of
+ the string collation.
</para>
<para>
@@ -324,6 +325,13 @@
</informaltable>
<para>
+ For all other escape sequences, backslash is ignored. That is,
+ the escaped character is interpreted as if it was not escaped.
+ For example, ‘<literal>\x</literal>’ is just
+ ‘<literal>x</literal>’.
+ </para>
+
+ <para>
These sequences are case sensitive. For example,
‘<literal>\b</literal>’ is interpreted as a
backspace, but ‘<literal>\B</literal>’ is
@@ -356,13 +364,6 @@
‘<literal>_</literal>’.
</para>
- <para>
- For all other escape sequences, backslash is ignored. That is,
- the escaped character is interpreted as if it was not escaped.
- For example, ‘<literal>\x</literal>’ is just
- ‘<literal>x</literal>’.
- </para>
-
<indexterm>
<primary>quotes</primary>
<secondary>in strings</secondary>
@@ -1044,8 +1045,9 @@
table <literal>t</literal> in database <literal>db1</literal>
and from a table <literal>t</literal> in database
<literal>db2</literal> in the same statement, you must refer to
- columns in those tables as <literal>db1.t.col_name</literal> and
- <literal>db2.t.col_name</literal>.
+ columns in those tables as
+ <literal>db1.t.<replaceable>col_name</replaceable></literal> and
+ <literal>db2.t.<replaceable>col_name</replaceable></literal>.
</para>
<para>
@@ -1167,7 +1169,7 @@
<para>
However, this same statement is permitted on Windows. To avoid
- being caught out by such differences, it is best to adopt a
+ problems caused by such differences, it is best to adopt a
consistent convention, such as always creating and referring to
databases and tables using lowercase names. This convention is
recommended for maximum portability and ease of use.
@@ -1383,10 +1385,10 @@
</para>
<para>
- If a user variable is assigned a string value, it also has the
- same character set and collation as the string. The coercibility
- of user variables is implicit. (This is the same coercibility as
- for table column values.)
+ If a user variable is assigned a string value, it has the same
+ character set and collation as the string. The coercibility of
+ user variables is implicit. (This is the same coercibility as for
+ table column values.)
</para>
<para>
@@ -1488,13 +1490,14 @@
<listitem>
<para>
- From a ‘<literal>-- </literal>’ sequence to the
- end of the line. In MySQL, the ‘<literal>--
- </literal>’ (double-dash) comment style requires the
- second dash to be followed by at least one whitespace or
- control character (such as a space, tab, newline, and so on).
- This syntax differs slightly from standard SQL comment syntax,
- as discussed in <xref linkend="ansi-diff-comments"/>.
+ From a ‘<literal>-- </literal>’ sequence to
+ the end of the line. In MySQL, the
+ ‘<literal>-- </literal>’ (double-dash)
+ comment style requires the second dash to be followed by at
+ least one whitespace or control character (such as a space,
+ tab, newline, and so on). This syntax differs slightly from
+ standard SQL comment syntax, as discussed in
+ <xref linkend="ansi-diff-comments"/>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1647 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 23 Mar |
