Author: paul
Date: 2008-06-25 03:18:26 +0200 (Wed, 25 Jun 2008)
New Revision: 11031
Log:
r32240@frost: paul | 2008-06-24 20:17:13 -0500
Add error_count, warning_count to session variable list.
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32239
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32240
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-06-25 01:18:18 UTC (rev 11030)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-06-25 01:18:26 UTC (rev 11031)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 0; 664 bytes
@@ -7132,6 +7132,8 @@
<mysqloption section="server" id="error_count">
+ <xrefto id="option_mysqld_error_count"/>
+
<name>error_count</name>
<shortdescription lang="en">
@@ -18506,6 +18508,8 @@
<mysqloption section="server" id="warning_count">
+ <xrefto id="option_mysqld_warning_count"/>
+
<name>warning_count</name>
<shortdescription lang="en">
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
+++ trunk/refman-4.1/dba-core.xml 2008-06-25 01:18:26 UTC (rev 11031)
Changed blocks: 2, Lines Added: 32, Lines Deleted: 0; 1477 bytes
@@ -6545,6 +6545,22 @@
</listitem>
<listitem>
+ <para id="option_mysqld_error_count">
+ <literal>ERROR_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors that resulted from the last statement
+ that generated messages. This variable is read only. See
+ <xref linkend="show-errors"/>.
+ </para>
+
+ <para>
+ This variable was added in MySQL 4.1.0.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -6870,6 +6886,22 @@
</para>
</listitem>
+ <listitem>
+ <para id="option_mysqld_warning_count">
+ <literal>WARNING_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors, warnings, and notes that resulted from
+ the last statement that generated messages. This variable is
+ read only. See <xref linkend="show-warnings"/>.
+ </para>
+
+ <para>
+ This variable was added in MySQL 4.1.0.
+ </para>
+ </listitem>
+
</itemizedlist>
</section>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
+++ trunk/refman-5.0/dba-core.xml 2008-06-25 01:18:26 UTC (rev 11031)
Changed blocks: 2, Lines Added: 24, Lines Deleted: 0; 1301 bytes
@@ -7796,6 +7796,18 @@
</listitem>
<listitem>
+ <para id="option_mysqld_error_count">
+ <literal>ERROR_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors that resulted from the last statement
+ that generated messages. This variable is read only. See
+ <xref linkend="show-errors"/>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8159,6 +8171,18 @@
</para>
</listitem>
+ <listitem>
+ <para id="option_mysqld_warning_count">
+ <literal>WARNING_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors, warnings, and notes that resulted from
+ the last statement that generated messages. This variable is
+ read only. See <xref linkend="show-warnings"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
</section>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
+++ trunk/refman-5.1/dba-core.xml 2008-06-25 01:18:26 UTC (rev 11031)
Changed blocks: 2, Lines Added: 24, Lines Deleted: 0; 1301 bytes
@@ -8245,6 +8245,18 @@
</listitem>
<listitem>
+ <para id="option_mysqld_error_count">
+ <literal>ERROR_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors that resulted from the last statement
+ that generated messages. This variable is read only. See
+ <xref linkend="show-errors"/>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8573,6 +8585,18 @@
</para>
</listitem>
+ <listitem>
+ <para id="option_mysqld_warning_count">
+ <literal>WARNING_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors, warnings, and notes that resulted from
+ the last statement that generated messages. This variable is
+ read only. See <xref linkend="show-warnings"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
</section>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
+++ trunk/refman-6.0/dba-core.xml 2008-06-25 01:18:26 UTC (rev 11031)
Changed blocks: 2, Lines Added: 24, Lines Deleted: 0; 1301 bytes
@@ -8126,6 +8126,18 @@
</listitem>
<listitem>
+ <para id="option_mysqld_error_count">
+ <literal>ERROR_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors that resulted from the last statement
+ that generated messages. This variable is read only. See
+ <xref linkend="show-errors"/>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8485,6 +8497,18 @@
</para>
</listitem>
+ <listitem>
+ <para id="option_mysqld_warning_count">
+ <literal>WARNING_COUNT</literal>
+ </para>
+
+ <para>
+ The number of errors, warnings, and notes that resulted from
+ the last statement that generated messages. This variable is
+ read only. See <xref linkend="show-warnings"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11031 - in trunk: . dynamic-docs/command-optvars refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 25 Jun |
