Author: paul
Date: 2007-04-10 18:46:45 +0200 (Tue, 10 Apr 2007)
New Revision: 5806
Log:
r23081@polar: paul | 2007-04-10 11:43:06 -0500
Document bugfix#9953.
Modified:
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23078
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18854
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23081
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18854
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-4.1/sql-syntax.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 690 bytes
@@ -10231,6 +10231,14 @@
</itemizedlist>
<para>
+ If you intend to use the <literal>HELP()</literal> statement
+ while other tables are locked with <literal>LOCK
+ TABLES</literal>, you must also lock the required
+ <literal>mysql.help_<replaceable>xxx</replaceable></literal>
+ tables.
+ </para>
+
+ <para>
The <literal>HELP</literal> statement was added in MySQL 4.1.
</para>
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-5.0/functions-core.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 404 bytes
@@ -103,7 +103,6 @@
-> 2
</programlisting>
-
<section id="func-op-summary-ref">
<title>Operator and Function Reference</title>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-5.0/sql-syntax.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 632 bytes
@@ -10921,6 +10921,14 @@
</itemizedlist>
+ <para>
+ If you intend to use the <literal>HELP()</literal> statement
+ while other tables are locked with <literal>LOCK
+ TABLES</literal>, you must also lock the required
+ <literal>mysql.help_<replaceable>xxx</replaceable></literal>
+ tables.
+ </para>
+
</section>
<section id="use">
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-5.1/functions-core.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 876 bytes
@@ -7244,10 +7244,11 @@
</para>
<para>
- If you intend to use <literal>CONVERT_TZ()</literal> while
- other tables are locked with <literal>LOCK TABLES</literal>,
- you must also lock the <literal>mysql.time_zone_name</literal>
- table.
+ Before MySQL 5.1.17, if you intend to use
+ <literal>CONVERT_TZ()</literal> while other tables are locked
+ with <literal>LOCK TABLES</literal>, you must also lock the
+ <literal>mysql.time_zone_name</literal> table. See
+ <xref linkend="lock-tables"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-5.1/news-5.1.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 1, Lines Added: 49, Lines Deleted: 0; 2174 bytes
@@ -1277,6 +1277,55 @@
<listitem>
<para>
+ For some operations, system tables in the
+ <literal>mysql</literal> database must be accessed. For
+ example, the <literal>HELP</literal> statement requires the
+ contents of the server-side help tables, and
+ <literal>CONVERT_TZ()</literal> might need to read the time
+ zone tables. However, to perform such operations while a
+ <literal>LOCK TABLES</literal> statement is in effect, the
+ server required you to also lock the requisite system tables
+ explicitly or a lock error occurred:
+ </para>
+
+<programlisting>
+mysql> <userinput>LOCK TABLE t1 READ;</userinput>
+Query OK, 0 rows affected (0.02 sec)
+mysql> <userinput>HELP HELP;</userinput>
+ERROR 1100 (HY000) at line 4: Table 'help_topic' was not
+locked with LOCK TABLES
+</programlisting>
+
+ <para>
+ Now, the server implicitly locks the system tables for reading
+ as necessary so that you need not lock them explicitly. These
+ tables are treated as just described:
+ </para>
+
+<programlisting>
+mysql.help_category
+mysql.help_keyword
+mysql.help_relation
+mysql.help_topic
+mysql.proc
+mysql.time_zone
+mysql.time_zone_leap_second
+mysql.time_zone_name
+mysql.time_zone_transition
+mysql.time_zone_transition_type
+</programlisting>
+
+ <para>
+ If you want to explicitly place a <literal>WRITE</literal>
+ lock on any of those tables with a <literal>LOCK
+ TABLES</literal> statement, the table must be the only one
+ locked; no other table can be locked with the same statement.
+ (Bug #9953)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
For a stored procedure containing a <literal>SELECT</literal>
statement that used a complicated join with an
<literal>ON</literal> expression, the expression could be
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-04-10 16:46:09 UTC (rev 5805)
+++ trunk/refman-5.1/sql-syntax.xml 2007-04-10 16:46:45 UTC (rev 5806)
Changed blocks: 2, Lines Added: 43, Lines Deleted: 0; 2198 bytes
@@ -12764,6 +12764,15 @@
</itemizedlist>
+ <para>
+ Before MySQL 5.1.17, if you intend to use the
+ <literal>HELP()</literal> statement while other tables are
+ locked with <literal>LOCK TABLES</literal>, you must also lock
+ the required
+ <literal>mysql.help_<replaceable>xxx</replaceable></literal>
+ tables. See <xref linkend="lock-tables"/>.
+ </para>
+
</section>
<section id="use">
@@ -13621,6 +13630,40 @@
</para>
<para>
+ For some operations, system tables in the
+ <literal>mysql</literal> database must be accessed. For example,
+ the <literal>HELP</literal> statement requires the contents of
+ the server-side help tables, and <literal>CONVERT_TZ()</literal>
+ might need to read the time zone tables. Before MySQL 5.1.17, to
+ perform such operations while a <literal>LOCK TABLES</literal>
+ statement is in effect, you must also lock the requisite system
+ tables explicitly or a lock error occurs. As of 5.1.17, the
+ server implicitly locks the system tables for reading as
+ necessary so that you need not lock them explicitly. These
+ tables are treated as just described:
+ </para>
+
+<programlisting>
+mysql.help_category
+mysql.help_keyword
+mysql.help_relation
+mysql.help_topic
+mysql.proc
+mysql.time_zone
+mysql.time_zone_leap_second
+mysql.time_zone_name
+mysql.time_zone_transition
+mysql.time_zone_transition_type
+</programlisting>
+
+ <para>
+ If you want to explicitly place a <literal>WRITE</literal> lock
+ on any of those tables with a <literal>LOCK TABLES</literal>
+ statement, the table must be the only one locked; no other table
+ can be locked with the same statement.
+ </para>
+
+ <para>
You can safely use <literal>KILL</literal> to terminate a thread
that is waiting for a table lock. See <xref linkend="kill"/>.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5806 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 Apr |
