Below is the list of changes that have just been committed into a local
mysqldoc repository of stefan. When stefan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.2888 05/06/28 12:27:17 stefan@stripped +6 -0
titles.ent, sql-syntax.xml:
Sync with refman
titles.ent:
Subquery errors => Subquery Limitations and Errors
sql-syntax.xml:
Clarify Subquery error description
refman-5.0/titles.ent
1.7 05/06/28 12:27:10 stefan@stripped +1 -1
Sync with refman
refman-5.0/sql-syntax.xml
1.4 05/06/28 12:27:09 stefan@stripped +6 -7
Sync with refman
refman-4.1/titles.ent
1.7 05/06/28 12:27:07 stefan@stripped +1 -1
Sync with refman
refman-4.1/sql-syntax.xml
1.4 05/06/28 12:27:06 stefan@stripped +6 -7
Sync with refman
refman/titles.ent
1.12 05/06/28 12:26:44 stefan@stripped +1 -1
Subquery errors => Subquery Limitations and Errors
refman/sql-syntax.xml
1.4 05/06/28 12:26:12 stefan@stripped +6 -7
Clarify Subquery error description
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: stefan
# Host: apollon.site
# Root: /home/stefan/bk/mysqldoc
--- 1.3/refman-4.1/sql-syntax.xml 2005-06-24 12:29:25 +02:00
+++ 1.4/refman-4.1/sql-syntax.xml 2005-06-28 12:27:06 +02:00
@@ -4574,8 +4574,8 @@
</programlisting>
<para>
- This error occurs for statements such as the following one, but
- only when there is more than one row in <literal>t2</literal>:
+ This error occurs for statements where the subquery returns more than
+ one row. Consider the following example:
</para>
<programlisting>
@@ -4583,11 +4583,10 @@
</programlisting>
<para>
- That means this error might occur in code that had been working
- for years, because somebody happened to make a change that
- affected the number of rows that the subquery can return. Remember
- that if the object is to find any number of rows, not just one,
- then the correct statement would look like this:
+ If <literal>SELECT column1 FROM t2</literal> returns just one row the
+ previous query will work fine. If the subquery returns more than one
+ row error 1242 will occur. In that case, the query should be rewritten
+ like this:
</para>
<programlisting>
--- 1.6/refman-4.1/titles.ent 2005-06-24 15:30:43 +02:00
+++ 1.7/refman-4.1/titles.ent 2005-06-28 12:27:07 +02:00
@@ -718,7 +718,7 @@
<!ENTITY title-dsn-on-unix "Configuring a MyODBC DSN on Unix"><!-- "Configuring a MyODBC DSN on Unix" -->
<!ENTITY title-fetching-spatial-data "Fetching Spatial Data"><!-- "Fetching Spatial Data" -->
<!ENTITY title-news-3-21-3 "Changes in release 3.21.3"><!-- "Changes in release 3.21.3" -->
-<!ENTITY title-subquery-errors "Subquery Errors"><!-- "Subquery Errors" -->
+<!ENTITY title-subquery-errors "Subquery Limitations and Errors"><!-- "Subquery Limitations and Errors" -->
<!ENTITY title-innodb-news-4-0-15 "MySQL/InnoDB-4.0.15, September 10, 2003"><!-- "MySQL/InnoDB-4.0.15, September 10, 2003" -->
<!ENTITY title-news-3-22-32 "Changes in release 3.22.32 (14 Feb 2000)"><!-- "Changes in release 3.22.32 (14 Feb 2000)" -->
<!ENTITY title-extensions-to-ansi "MySQL Extensions to Standard SQL"><!-- "MySQL Extensions to Standard SQL" -->
--- 1.3/refman-5.0/sql-syntax.xml 2005-06-24 12:29:29 +02:00
+++ 1.4/refman-5.0/sql-syntax.xml 2005-06-28 12:27:09 +02:00
@@ -4574,8 +4574,8 @@
</programlisting>
<para>
- This error occurs for statements such as the following one, but
- only when there is more than one row in <literal>t2</literal>:
+ This error occurs for statements where the subquery returns more than
+ one row. Consider the following example:
</para>
<programlisting>
@@ -4583,11 +4583,10 @@
</programlisting>
<para>
- That means this error might occur in code that had been working
- for years, because somebody happened to make a change that
- affected the number of rows that the subquery can return. Remember
- that if the object is to find any number of rows, not just one,
- then the correct statement would look like this:
+ If <literal>SELECT column1 FROM t2</literal> returns just one row the
+ previous query will work fine. If the subquery returns more than one
+ row error 1242 will occur. In that case, the query should be rewritten
+ like this:
</para>
<programlisting>
--- 1.6/refman-5.0/titles.ent 2005-06-24 15:30:44 +02:00
+++ 1.7/refman-5.0/titles.ent 2005-06-28 12:27:10 +02:00
@@ -718,7 +718,7 @@
<!ENTITY title-dsn-on-unix "Configuring a MyODBC DSN on Unix"><!-- "Configuring a MyODBC DSN on Unix" -->
<!ENTITY title-fetching-spatial-data "Fetching Spatial Data"><!-- "Fetching Spatial Data" -->
<!ENTITY title-news-3-21-3 "Changes in release 3.21.3"><!-- "Changes in release 3.21.3" -->
-<!ENTITY title-subquery-errors "Subquery Errors"><!-- "Subquery Errors" -->
+<!ENTITY title-subquery-errors "Subquery Limitations and Errors"><!-- "Subquery Limitations and Errors" -->
<!ENTITY title-innodb-news-4-0-15 "MySQL/InnoDB-4.0.15, September 10, 2003"><!-- "MySQL/InnoDB-4.0.15, September 10, 2003" -->
<!ENTITY title-news-3-22-32 "Changes in release 3.22.32 (14 Feb 2000)"><!-- "Changes in release 3.22.32 (14 Feb 2000)" -->
<!ENTITY title-extensions-to-ansi "MySQL Extensions to Standard SQL"><!-- "MySQL Extensions to Standard SQL" -->
--- 1.3/refman/sql-syntax.xml 2005-06-24 12:29:10 +02:00
+++ 1.4/refman/sql-syntax.xml 2005-06-28 12:26:12 +02:00
@@ -4574,8 +4574,8 @@
</programlisting>
<para>
- This error occurs for statements such as the following one, but
- only when there is more than one row in <literal>t2</literal>:
+ This error occurs for statements where the subquery returns more than
+ one row. Consider the following example:
</para>
<programlisting>
@@ -4583,11 +4583,10 @@
</programlisting>
<para>
- That means this error might occur in code that had been working
- for years, because somebody happened to make a change that
- affected the number of rows that the subquery can return. Remember
- that if the object is to find any number of rows, not just one,
- then the correct statement would look like this:
+ If <literal>SELECT column1 FROM t2</literal> returns just one row the
+ previous query will work fine. If the subquery returns more than one
+ row error 1242 will occur. In that case, the query should be rewritten
+ like this:
</para>
<programlisting>
--- 1.11/refman/titles.ent 2005-06-24 15:30:24 +02:00
+++ 1.12/refman/titles.ent 2005-06-28 12:26:44 +02:00
@@ -718,7 +718,7 @@
<!ENTITY title-dsn-on-unix "Configuring a MyODBC DSN on Unix"><!-- "Configuring a MyODBC DSN on Unix" -->
<!ENTITY title-fetching-spatial-data "Fetching Spatial Data"><!-- "Fetching Spatial Data" -->
<!ENTITY title-news-3-21-3 "Changes in release 3.21.3"><!-- "Changes in release 3.21.3" -->
-<!ENTITY title-subquery-errors "Subquery Errors"><!-- "Subquery Errors" -->
+<!ENTITY title-subquery-errors "Subquery Limitations and Errors"><!-- "Subquery Limitations and Errors" -->
<!ENTITY title-innodb-news-4-0-15 "MySQL/InnoDB-4.0.15, September 10, 2003"><!-- "MySQL/InnoDB-4.0.15, September 10, 2003" -->
<!ENTITY title-news-3-22-32 "Changes in release 3.22.32 (14 Feb 2000)"><!-- "Changes in release 3.22.32 (14 Feb 2000)" -->
<!ENTITY title-extensions-to-ansi "MySQL Extensions to Standard SQL"><!-- "MySQL Extensions to Standard SQL" -->
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (stefan:1.2888) | stefan | 28 Jun |
