Author: paul
Date: 2008-11-20 04:25:54 +0100 (Thu, 20 Nov 2008)
New Revision: 12559
Log:
r35918@frost: paul | 2008-11-19 20:45:26 -0500
Add auto-link markup
Modified:
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-4.1/news-3.23.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-6.0/dba-core.xml
trunk/refman-6.0/functions-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35917
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35918
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1141 bytes
@@ -29871,7 +29871,7 @@
<para>
When using a <literal>FEDERATED</literal> table, the value of
- <literal>last_insert_id()</literal> would not correctly update
+ <literal role="func">LAST_INSERT_ID()</literal> would not correctly update
the C API interface, which would affect the autogenerated ID
returned both through the C API and the MySQL protocol,
affecting Connectors that used the protocol and/or C API.
@@ -39648,7 +39648,7 @@
<literal role="stmt">INSERT</literal> statements, not just for
multiple-row <literal role="stmt">INSERT</literal> statements.
Previously, it was necessary to set
- <literal>sql_warnings = 1</literal> to generate warnings for
+ <literal role="sysvar">sql_warnings = 1</literal> to generate warnings for
single-row statements.
</para>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-4.1/data-types.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1180 bytes
@@ -3596,8 +3596,8 @@
<literal role="type">TIMESTAMP</literal> columns display as
strings rather than as numbers. Also,
<literal role="stmt">DESCRIBE</literal> displays the column
- definition as <literal>timestamp(19)</literal>, rather than as
- <literal>timestamp(14)</literal>.
+ definition as <literal role="type">TIMESTAMP(19)</literal>, rather than as
+ <literal role="type">TIMESTAMP(14)</literal>.
</para>
<para>
@@ -3606,7 +3606,7 @@
created while <literal>new</literal> is set to 1. In this
case, column values display as strings and
<literal role="stmt">DESCRIBE</literal> shows the definition
- as <literal>timestamp(19)</literal>, regardless of the current
+ as <literal role="type">TIMESTAMP(19)</literal>, regardless of the current
value of <literal>new</literal>.
</para>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-4.1/dba-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 14, Lines Added: 14, Lines Deleted: 14; 3807 bytes
@@ -6319,7 +6319,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>insert_id =
+ <literal role="sysvar">insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -6345,7 +6345,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>last_insert_id =
+ <literal role="sysvar">last_insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -6437,7 +6437,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_auto_is_null = {0 | 1}</literal>
+ <literal role="sysvar">sql_auto_is_null = {0 | 1}</literal>
</para>
<para>
@@ -6469,7 +6469,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_big_selects = {0 | 1}</literal>
+ <literal role="sysvar">sql_big_selects = {0 | 1}</literal>
</para>
<para>
@@ -6504,7 +6504,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_buffer_result = {0 | 1}</literal>
+ <literal role="sysvar">sql_buffer_result = {0 | 1}</literal>
</para>
<para>
@@ -6531,7 +6531,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_bin = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_bin = {0 | 1}</literal>
</para>
<para>
@@ -6556,7 +6556,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_off = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_off = {0 | 1}</literal>
</para>
<para>
@@ -6580,7 +6580,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_update = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_update = {0 | 1}</literal>
</para>
<para>
@@ -6605,7 +6605,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_notes = {0 | 1}</literal>
+ <literal role="sysvar">sql_notes = {0 | 1}</literal>
</para>
<para>
@@ -6633,7 +6633,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_quote_show_create = {0 | 1}</literal>
+ <literal role="sysvar">sql_quote_show_create = {0 | 1}</literal>
</para>
<para>
@@ -6662,7 +6662,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_safe_updates = {0 | 1}</literal>
+ <literal role="sysvar">sql_safe_updates = {0 | 1}</literal>
</para>
<para>
@@ -6692,7 +6692,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_warnings = {0 | 1}</literal>
+ <literal role="sysvar">sql_warnings = {0 | 1}</literal>
</para>
<para>
@@ -6717,7 +6717,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>timestamp =
+ <literal role="sysvar">timestamp =
{<replaceable>timestamp_value</replaceable> |
DEFAULT}</literal>
</para>
@@ -6743,7 +6743,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>unique_checks = {0 | 1}</literal>
+ <literal role="sysvar">unique_checks = {0 | 1}</literal>
</para>
<para>
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-4.1/functions-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -804,7 +804,7 @@
<para>
This behavior can be disabled by setting
- <literal>sql_auto_is_null = 0</literal>. See
+ <literal role="sysvar">sql_auto_is_null = 0</literal>. See
<xref linkend="server-session-variables"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-4.1/news-3.23.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 508 bytes
@@ -6634,7 +6634,7 @@
<listitem>
<para>
Don't write <literal>INSERT DELAYED</literal> to update log if
- <literal>sql_log_update = 0</literal>.
+ <literal role="sysvar">sql_log_update = 0</literal>.
</para>
</listitem>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-5.0/dba-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 16, Lines Added: 16, Lines Deleted: 16; 4321 bytes
@@ -7268,7 +7268,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>insert_id =
+ <literal role="sysvar">insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -7294,7 +7294,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>last_insert_id =
+ <literal role="sysvar">last_insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -7323,7 +7323,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling = {0 | 1}</literal>
+ <literal role="sysvar">profiling = {0 | 1}</literal>
</para>
<para>
@@ -7351,7 +7351,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling_history_size =
+ <literal role="sysvar">profiling_history_size =
<replaceable>value</replaceable></literal>
</para>
@@ -7439,7 +7439,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_auto_is_null = {0 | 1}</literal>
+ <literal role="sysvar">sql_auto_is_null = {0 | 1}</literal>
</para>
<para>
@@ -7471,7 +7471,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_big_selects = {0 | 1}</literal>
+ <literal role="sysvar">sql_big_selects = {0 | 1}</literal>
</para>
<para>
@@ -7506,7 +7506,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_buffer_result = {0 | 1}</literal>
+ <literal role="sysvar">sql_buffer_result = {0 | 1}</literal>
</para>
<para>
@@ -7532,7 +7532,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_bin = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_bin = {0 | 1}</literal>
</para>
<para>
@@ -7556,7 +7556,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_off = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_off = {0 | 1}</literal>
</para>
<para>
@@ -7580,7 +7580,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_update = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_update = {0 | 1}</literal>
</para>
<para>
@@ -7602,7 +7602,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_notes = {0 | 1}</literal>
+ <literal role="sysvar">sql_notes = {0 | 1}</literal>
</para>
<para>
@@ -7630,7 +7630,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_quote_show_create = {0 | 1}</literal>
+ <literal role="sysvar">sql_quote_show_create = {0 | 1}</literal>
</para>
<para>
@@ -7658,7 +7658,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_safe_updates = {0 | 1}</literal>
+ <literal role="sysvar">sql_safe_updates = {0 | 1}</literal>
</para>
<para>
@@ -7687,7 +7687,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_warnings = {0 | 1}</literal>
+ <literal role="sysvar">sql_warnings = {0 | 1}</literal>
</para>
<para>
@@ -7711,7 +7711,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>timestamp =
+ <literal role="sysvar">timestamp =
{<replaceable>timestamp_value</replaceable> |
DEFAULT}</literal>
</para>
@@ -7750,7 +7750,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>unique_checks = {0 | 1}</literal>
+ <literal role="sysvar">unique_checks = {0 | 1}</literal>
</para>
<para>
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-5.0/functions-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -940,7 +940,7 @@
<para>
This behavior can be disabled by setting
- <literal>sql_auto_is_null = 0</literal>. See
+ <literal role="sysvar">sql_auto_is_null = 0</literal>. See
<xref linkend="server-session-variables"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-5.1/dba-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 16, Lines Added: 16, Lines Deleted: 16; 4321 bytes
@@ -8611,7 +8611,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>insert_id =
+ <literal role="sysvar">insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -8637,7 +8637,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>last_insert_id =
+ <literal role="sysvar">last_insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -8666,7 +8666,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling = {0 | 1}</literal>
+ <literal role="sysvar">profiling = {0 | 1}</literal>
</para>
<para>
@@ -8693,7 +8693,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling_history_size =
+ <literal role="sysvar">profiling_history_size =
<replaceable>value</replaceable></literal>
</para>
@@ -8781,7 +8781,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_auto_is_null = {0 | 1}</literal>
+ <literal role="sysvar">sql_auto_is_null = {0 | 1}</literal>
</para>
<para>
@@ -8813,7 +8813,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_big_selects = {0 | 1}</literal>
+ <literal role="sysvar">sql_big_selects = {0 | 1}</literal>
</para>
<para>
@@ -8848,7 +8848,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_buffer_result = {0 | 1}</literal>
+ <literal role="sysvar">sql_buffer_result = {0 | 1}</literal>
</para>
<para>
@@ -8874,7 +8874,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_bin = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_bin = {0 | 1}</literal>
</para>
<para>
@@ -8898,7 +8898,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_off = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_off = {0 | 1}</literal>
</para>
<para>
@@ -8922,7 +8922,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_update = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_update = {0 | 1}</literal>
</para>
<para>
@@ -8944,7 +8944,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_notes = {0 | 1}</literal>
+ <literal role="sysvar">sql_notes = {0 | 1}</literal>
</para>
<para>
@@ -8971,7 +8971,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_quote_show_create = {0 | 1}</literal>
+ <literal role="sysvar">sql_quote_show_create = {0 | 1}</literal>
</para>
<para>
@@ -8999,7 +8999,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_safe_updates = {0 | 1}</literal>
+ <literal role="sysvar">sql_safe_updates = {0 | 1}</literal>
</para>
<para>
@@ -9028,7 +9028,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_warnings = {0 | 1}</literal>
+ <literal role="sysvar">sql_warnings = {0 | 1}</literal>
</para>
<para>
@@ -9052,7 +9052,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>timestamp =
+ <literal role="sysvar">timestamp =
{<replaceable>timestamp_value</replaceable> |
DEFAULT}</literal>
</para>
@@ -9091,7 +9091,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>unique_checks = {0 | 1}</literal>
+ <literal role="sysvar">unique_checks = {0 | 1}</literal>
</para>
<para>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-5.1/functions-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -930,7 +930,7 @@
<para>
This behavior can be disabled by setting
- <literal>sql_auto_is_null = 0</literal>. See
+ <literal role="sysvar">sql_auto_is_null = 0</literal>. See
<xref linkend="server-session-variables"/>.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-6.0/dba-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 16, Lines Added: 16, Lines Deleted: 16; 4321 bytes
@@ -8659,7 +8659,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>insert_id =
+ <literal role="sysvar">insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -8685,7 +8685,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>last_insert_id =
+ <literal role="sysvar">last_insert_id =
<replaceable>value</replaceable></literal>
</para>
@@ -8714,7 +8714,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling = {0 | 1}</literal>
+ <literal role="sysvar">profiling = {0 | 1}</literal>
</para>
<para>
@@ -8741,7 +8741,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>profiling_history_size =
+ <literal role="sysvar">profiling_history_size =
<replaceable>value</replaceable></literal>
</para>
@@ -8829,7 +8829,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_auto_is_null = {0 | 1}</literal>
+ <literal role="sysvar">sql_auto_is_null = {0 | 1}</literal>
</para>
<para>
@@ -8861,7 +8861,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_big_selects = {0 | 1}</literal>
+ <literal role="sysvar">sql_big_selects = {0 | 1}</literal>
</para>
<para>
@@ -8896,7 +8896,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_buffer_result = {0 | 1}</literal>
+ <literal role="sysvar">sql_buffer_result = {0 | 1}</literal>
</para>
<para>
@@ -8922,7 +8922,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_bin = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_bin = {0 | 1}</literal>
</para>
<para>
@@ -8946,7 +8946,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_off = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_off = {0 | 1}</literal>
</para>
<para>
@@ -8970,7 +8970,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_log_update = {0 | 1}</literal>
+ <literal role="sysvar">sql_log_update = {0 | 1}</literal>
</para>
<para>
@@ -8992,7 +8992,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_notes = {0 | 1}</literal>
+ <literal role="sysvar">sql_notes = {0 | 1}</literal>
</para>
<para>
@@ -9019,7 +9019,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_quote_show_create = {0 | 1}</literal>
+ <literal role="sysvar">sql_quote_show_create = {0 | 1}</literal>
</para>
<para>
@@ -9047,7 +9047,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_safe_updates = {0 | 1}</literal>
+ <literal role="sysvar">sql_safe_updates = {0 | 1}</literal>
</para>
<para>
@@ -9076,7 +9076,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>sql_warnings = {0 | 1}</literal>
+ <literal role="sysvar">sql_warnings = {0 | 1}</literal>
</para>
<para>
@@ -9100,7 +9100,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>timestamp =
+ <literal role="sysvar">timestamp =
{<replaceable>timestamp_value</replaceable> |
DEFAULT}</literal>
</para>
@@ -9139,7 +9139,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <literal>unique_checks = {0 | 1}</literal>
+ <literal role="sysvar">unique_checks = {0 | 1}</literal>
</para>
<para>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-11-20 03:25:27 UTC (rev 12558)
+++ trunk/refman-6.0/functions-core.xml 2008-11-20 03:25:54 UTC (rev 12559)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 604 bytes
@@ -1034,7 +1034,7 @@
<para>
This behavior can be disabled by setting
- <literal>sql_auto_is_null = 0</literal>. See
+ <literal role="sysvar">sql_auto_is_null = 0</literal>. See
<xref linkend="server-session-variables"/>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12559 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 20 Nov |
