Author: paul
Date: 2008-01-09 20:14:57 +0100 (Wed, 09 Jan 2008)
New Revision: 9536
Log:
r34799@arctic: paul | 2008-01-09 12:02:51 -0600
Add markup
Modified:
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-4.1/internationalization.xml
trunk/refman-4.1/news-3.20.xml
trunk/refman-4.1/news-3.21.xml
trunk/refman-4.1/news-3.22.xml
trunk/refman-4.1/news-3.23.xml
trunk/refman-4.1/news-4.0.xml
trunk/refman-4.1/optimization.xml
trunk/refman-4.1/replication.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-5.1/partitioning-guide.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-6.0/data-types.xml
trunk/refman-6.0/functions-core.xml
trunk/refman-6.0/partitioning-guide.xml
trunk/refman-6.0/partitioning.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34798
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28489
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:23202
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34799
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28489
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:23202
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/data-types.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1273 bytes
@@ -3735,13 +3735,13 @@
of its synonyms
(<function role="sql">CURRENT_TIMESTAMP()</function>,
<function role="sql">NOW()</function>,
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>,
- <literal>LOCALTIMESTAMP</literal>, or
+ <function role="sql">LOCALTIMESTAMP</function>, or
<function role="sql">LOCALTIMESTAMP()</function>) can be
used in the <literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ timestamp.</quote> (<function role="sql">UTC_TIMESTAMP</function> is
not allowed. Its range of values does not align with those
of the <literal>TIMESTAMP</literal> column anyway unless
the current time zone is <literal>UTC</literal>.)
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/functions-core.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 29, Lines Added: 34, Lines Deleted: 34; 10125 bytes
@@ -1664,7 +1664,7 @@
</para>
<para>
- <literal>XOR</literal> was added in MySQL 4.0.2.
+ <function role="sqlop">XOR</function> was added in MySQL 4.0.2.
</para>
</listitem>
@@ -2690,7 +2690,7 @@
<primary>INSERT()</primary>
</indexterm>
- <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
+ <function role="sql">INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2738,7 +2738,7 @@
<primary>INSTR()</primary>
</indexterm>
- <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
+ <function role="sql">INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2781,7 +2781,7 @@
<primary>LCASE()</primary>
</indexterm>
- <literal>LCASE(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LCASE(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2806,7 +2806,7 @@
<primary>LEFT()</primary>
</indexterm>
- <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
+ <function role="sql">LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2838,7 +2838,7 @@
<primary>LENGTH()</primary>
</indexterm>
- <literal>LENGTH(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LENGTH(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2880,7 +2880,7 @@
<primary>LOAD_FILE()</primary>
</indexterm>
- <literal>LOAD_FILE(<replaceable>file_name</replaceable>)</literal>
+ <function role="sql">LOAD_FILE(<replaceable>file_name</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2932,8 +2932,8 @@
<primary>LOCATE()</primary>
</indexterm>
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>,
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>,
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3248,7 +3248,7 @@
<para>
<literal>POSITION(<replaceable>substr</replaceable> IN
<replaceable>str</replaceable>)</literal> is a synonym for
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>.
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>.
</para>
<remark role="help-description-end"/>
@@ -5635,7 +5635,7 @@
<primary>DIV</primary>
</indexterm>
- <literal>DIV</literal>
+ <function role="sqlop">DIV</function>
</para>
<remark role="help-syntax-end"/>
@@ -5658,7 +5658,7 @@
</programlisting>
<para>
- <literal>DIV</literal> was implemented in MySQL 4.1.0.
+ <function role="sqlop">DIV</function> was implemented in MySQL 4.1.0.
</para>
</listitem>
@@ -6112,7 +6112,7 @@
<primary>CRC32()</primary>
</indexterm>
- <literal>CRC32(<replaceable>expr</replaceable>)</literal>
+ <function role="sql">CRC32(<replaceable>expr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6303,7 +6303,7 @@
<primary>LN()</primary>
</indexterm>
- <literal>LN(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LN(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6330,7 +6330,7 @@
<para>
This function was added in MySQL 4.0.3. It is synonymous
- with <literal>LOG(<replaceable>X</replaceable>)</literal>.
+ with <function role="sql">LOG(<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -6344,8 +6344,8 @@
<primary>LOG()</primary>
</indexterm>
- <literal>LOG(<replaceable>X</replaceable>)</literal>,
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>,
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6383,9 +6383,9 @@
<para>
The arbitrary base option was added in MySQL 4.0.3.
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
- is equivalent to <literal>LOG(<replaceable>X</replaceable>)
- / LOG(<replaceable>B</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
+ is equivalent to <function role="sql">LOG(<replaceable>X</replaceable>)
+ / LOG(<replaceable>B</replaceable>)</function>.
</para>
</listitem>
@@ -6399,7 +6399,7 @@
<primary>LOG2()</primary>
</indexterm>
- <literal>LOG2(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG2(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6426,8 +6426,8 @@
<function role="sql">LOG2()</function> is useful for finding
out how many bits a number would require for storage. This
function was added in MySQL 4.0.3. In earlier versions, you
- can use <literal>LOG(<replaceable>X</replaceable>) /
- LOG(2)</literal> instead.
+ can use <function role="sql">LOG(<replaceable>X</replaceable>) /
+ LOG(2)</function> instead.
</para>
</listitem>
@@ -6441,7 +6441,7 @@
<primary>LOG10()</primary>
</indexterm>
- <literal>LOG10(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -8751,7 +8751,7 @@
<primary>LAST_DAY()</primary>
</indexterm>
- <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
+ <function role="sql">LAST_DAY(<replaceable>date</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -8795,7 +8795,7 @@
<primary>LOCALTIME</primary>
</indexterm>
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>
</para>
@@ -8804,7 +8804,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIME</literal> and
+ <function role="sql">LOCALTIME</function> and
<function role="sql">LOCALTIME()</function> are synonyms for
<function role="sql">NOW()</function>.
</para>
@@ -8822,7 +8822,7 @@
<primary>LOCALTIMESTAMP</primary>
</indexterm>
- <literal>LOCALTIMESTAMP</literal>,
+ <function role="sql">LOCALTIMESTAMP</function>,
<function role="sql">LOCALTIMESTAMP()</function>
</para>
@@ -8831,7 +8831,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIMESTAMP</literal> and
+ <function role="sql">LOCALTIMESTAMP</function> and
<function role="sql">LOCALTIMESTAMP()</function> are synonyms
for <function role="sql">NOW()</function>.
</para>
@@ -9924,7 +9924,7 @@
<primary>UTC_DATE()</primary>
</indexterm>
- <literal>UTC_DATE</literal>,
+ <function role="sql">UTC_DATE</function>,
<function role="sql">UTC_DATE()</function>
</para>
@@ -9964,7 +9964,7 @@
<primary>UTC_TIME()</primary>
</indexterm>
- <literal>UTC_TIME</literal>,
+ <function role="sql">UTC_TIME</function>,
<function role="sql">UTC_TIME()</function>
</para>
@@ -10005,7 +10005,7 @@
<primary>UTC_TIMESTAMP()</primary>
</indexterm>
- <literal>UTC_TIMESTAMP</literal>,
+ <function role="sql">UTC_TIMESTAMP</function>,
<function role="sql">UTC_TIMESTAMP()</function>
</para>
@@ -15487,7 +15487,7 @@
<primary>IS_FREE_LOCK()</primary>
</indexterm>
- <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_FREE_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -15521,7 +15521,7 @@
<primary>IS_USED_LOCK()</primary>
</indexterm>
- <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_USED_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/internationalization.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 684 bytes
@@ -5390,7 +5390,7 @@
<listitem>
<para>
- When comparing strings with <literal>LIKE</literal>, the
+ When comparing strings with <function role="sqlop">LIKE</function>, the
one-character to two-character mapping is not done. All
letters are converted to uppercase. Accents are removed from
all letters except <literal>Ü</literal>,
Modified: trunk/refman-4.1/news-3.20.xml
===================================================================
--- trunk/refman-4.1/news-3.20.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/news-3.20.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 678 bytes
@@ -243,8 +243,8 @@
<listitem>
<para>
- <literal>LIKE</literal> was case-sensitive in some places and
- case-insensitive in others. Now <literal>LIKE</literal> is
+ <function role="sqlop">LIKE</function> was case-sensitive in some places and
+ case-insensitive in others. Now <function role="sqlop">LIKE</function> is
always case-insensitive.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.21.xml
===================================================================
--- trunk/refman-4.1/news-3.21.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/news-3.21.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 1530 bytes
@@ -132,7 +132,7 @@
<listitem>
<para>
Fixed problem with
- <literal>LEFT("constant_string",function)</literal>.
+ <function role="sql">LEFT("constant_string",function)</function>.
</para>
</listitem>
@@ -656,7 +656,7 @@
<listitem>
<para>
- Added hooks to allow <literal>LIKE</literal> optimization with
+ Added hooks to allow <function role="sqlop">LIKE</function> optimization with
international character support.
</para>
</listitem>
@@ -891,7 +891,7 @@
<listitem>
<para>
Fixed problem with Russian character set and
- <literal>LIKE</literal>.
+ <function role="sqlop">LIKE</function>.
</para>
</listitem>
@@ -1591,7 +1591,7 @@
<listitem>
<para>
- Fixed bug with <literal>LIKE</literal> on number key.
+ Fixed bug with <function role="sqlop">LIKE</function> on number key.
</para>
</listitem>
@@ -1683,7 +1683,7 @@
<listitem>
<para>
- <literal>LIKE</literal> with <literal>'_'</literal> as last
+ <function role="sqlop">LIKE</function> with <literal>'_'</literal> as last
character didn't work. Fixed.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/news-3.22.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 828 bytes
@@ -1532,7 +1532,7 @@
<listitem>
<para>
Moved <literal>wild_compare()</literal> to string class to be
- able to use <literal>LIKE</literal> on
+ able to use <function role="sqlop">LIKE</function> on
<literal>BLOB</literal>/<literal>TEXT</literal> columns with
<literal>\0</literal>.
</para>
@@ -1541,7 +1541,7 @@
<listitem>
<para>
Added <literal>ESCAPE</literal> option to
- <literal>LIKE</literal>.
+ <function role="sqlop">LIKE</function>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/news-3.23.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 7, Lines Added: 31, Lines Deleted: 31; 6876 bytes
@@ -3076,7 +3076,7 @@
<listitem>
<para>
Fixed a bug when using <literal>HEAP</literal> tables with
- <literal>LIKE</literal>.
+ <function role="sqlop">LIKE</function>.
</para>
</listitem>
@@ -3212,7 +3212,7 @@
<para>
Applied patch for the <literal>tis620</literal> character set
to make comparisons case-independent and to fix a bug in
- <literal>LIKE</literal> for this character set.
+ <function role="sqlop">LIKE</function> for this character set.
</para>
<note>
@@ -6654,7 +6654,7 @@
<listitem>
<para>
- Fixed core dump in <literal>LOAD_FILE(NULL)</literal>.
+ Fixed core dump in <function role="sql">LOAD_FILE(NULL)</function>.
</para>
</listitem>
@@ -7416,7 +7416,7 @@
<listitem>
<para>
Fixed problem with <literal>BLOB NULL</literal> keys and
- <literal>LIKE "prefix%"</literal>.
+ <function role="sql" condition="like">LIKE "prefix%"</function>.
</para>
</listitem>
@@ -7509,33 +7509,33 @@
<listitem>
<para>
The following functions are now multi-byte-safe:
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>,
- <literal>POSITION(<replaceable>substr</replaceable> IN
- <replaceable>str</replaceable>)</literal>,
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>,
- <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>,
- <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>,
- <literal>RIGHT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>,
- <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>,
- <literal>SUBSTRING(<replaceable>str</replaceable> FROM
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>,
+ <function role="sql">POSITION(<replaceable>substr</replaceable> IN
+ <replaceable>str</replaceable>)</function>,
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>,
+ <function role="sql">INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</function>,
+ <function role="sql">LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>,
+ <function role="sql">RIGHT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>,
+ <function role="sql">SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>,
+ <function role="sql">SUBSTRING(<replaceable>str</replaceable> FROM
<replaceable>pos</replaceable> FOR
- <replaceable>len</replaceable>)</literal>,
- <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>,
- <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>,
- <literal>SUBSTRING(<replaceable>str</replaceable> FROM
- <replaceable>pos</replaceable>)</literal>,
- <literal>SUBSTRING_INDEX(<replaceable>str</replaceable>,<replaceable>delim</replaceable>,<replaceable>count</replaceable>)</literal>,
- <literal>RTRIM(<replaceable>str</replaceable>)</literal>,
- <literal>TRIM([[BOTH | TRAILING]
+ <replaceable>len</replaceable>)</function>,
+ <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>,
+ <function role="sql">SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>,
+ <function role="sql">SUBSTRING(<replaceable>str</replaceable> FROM
+ <replaceable>pos</replaceable>)</function>,
+ <function role="sql">SUBSTRING_INDEX(<replaceable>str</replaceable>,<replaceable>delim</replaceable>,<replaceable>count</replaceable>)</function>,
+ <function role="sql">RTRIM(<replaceable>str</replaceable>)</function>,
+ <function role="sql">TRIM([[BOTH | TRAILING]
[<replaceable>remstr</replaceable>] FROM]
- <replaceable>str</replaceable>)</literal>,
- <literal>REPLACE(<replaceable>str</replaceable>,<replaceable>from_str</replaceable>,<replaceable>to_str</replaceable>)</literal>,
- <literal>REVERSE(<replaceable>str</replaceable>)</literal>,
- <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>,
- <literal>LCASE(<replaceable>str</replaceable>)</literal>,
- <literal>LOWER(<replaceable>str</replaceable>)</literal>,
- <literal>UCASE(<replaceable>str</replaceable>)</literal> and
- <literal>UPPER(<replaceable>str</replaceable>)</literal>;
+ <replaceable>str</replaceable>)</function>,
+ <function role="sql">REPLACE(<replaceable>str</replaceable>,<replaceable>from_str</replaceable>,<replaceable>to_str</replaceable>)</function>,
+ <function role="sql">REVERSE(<replaceable>str</replaceable>)</function>,
+ <function role="sql">INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</function>,
+ <function role="sql">LCASE(<replaceable>str</replaceable>)</function>,
+ <function role="sql">LOWER(<replaceable>str</replaceable>)</function>,
+ <function role="sql">UCASE(<replaceable>str</replaceable>)</function> and
+ <function role="sql">UPPER(<replaceable>str</replaceable>)</function>;
patch by Wei He.
</para>
</listitem>
@@ -7964,7 +7964,7 @@
<listitem>
<para>
- Fixed problem with <literal>LIKE "%"</literal> on an index
+ Fixed problem with <function role="sql" condition="like">LIKE "%"</function> on an index
that may have <literal>NULL</literal> values.
</para>
</listitem>
@@ -8459,7 +8459,7 @@
<listitem>
<para>
- Added <literal>LIKE</literal> to the <literal>SHOW
+ Added <function role="sqlop">LIKE</function> to the <literal>SHOW
STATUS</literal> command.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/news-4.0.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1810 bytes
@@ -8344,7 +8344,7 @@
Added <function role="sql">LN()</function> natural logarithm
function for compatibility with other databases. It is
synonymous with
- <literal>LOG(<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -8405,16 +8405,16 @@
<listitem>
<para>
- Added <literal>XOR</literal> operator (logical and bitwise
- <literal>XOR</literal>) with
+ Added <function role="sqlop">XOR</function> operator (logical and bitwise
+ <function role="sqlop">XOR</function>) with
<function role="sqlop" condition="bitwise-xor">^</function> as
- a synonym for bitwise <literal>XOR</literal>.
+ a synonym for bitwise <function role="sqlop">XOR</function>.
</para>
</listitem>
<listitem>
<para>
- Added function <literal>IS_FREE_LOCK("lock_name")</literal>.
+ Added function <function role="sql">IS_FREE_LOCK('<replaceable>lock_name</replaceable>')</function>.
Based on code contributed by Hartmut Holzgraefe
<email>hartmut@stripped</email>.
</para>
@@ -8549,8 +8549,8 @@
<listitem>
<para>
- Use <literal>Turbo Boyer-Moore</literal> algorithm to speed up
- <literal>LIKE "%keyword%"</literal> searches.
+ Use Turbo Boyer-Moore algorithm to speed up
+ <function role="sqlop">LIKE "%keyword%"</function> searches.
</para>
</listitem>
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/optimization.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 695 bytes
@@ -6246,7 +6246,7 @@
<para>
MySQL 4.0 and later versions perform an additional
- <literal>LIKE</literal> optimization. If you use <literal>...
+ <function role="sqlop">LIKE</function> optimization. If you use <literal>...
LIKE '%<replaceable>string</replaceable>%'</literal> and
<replaceable>string</replaceable> is longer than three
characters, MySQL uses the <firstterm>Turbo Boyer-Moore
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-4.1/replication.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 789 bytes
@@ -3169,7 +3169,7 @@
and table name patterns. Patterns can contain the
<quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> wildcard characters, which
- have the same meaning as for the <literal>LIKE</literal>
+ have the same meaning as for the <function role="sqlop">LIKE</function>
pattern-matching operator. To specify more than one table, use
this option multiple times, once for each table. This works
for cross-database updates. See
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.0/data-types.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1273 bytes
@@ -3495,13 +3495,13 @@
of its synonyms
(<function role="sql">CURRENT_TIMESTAMP()</function>,
<function role="sql">NOW()</function>,
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>,
- <literal>LOCALTIMESTAMP</literal>, or
+ <function role="sql">LOCALTIMESTAMP</function>, or
<function role="sql">LOCALTIMESTAMP()</function>) can be
used in the <literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ timestamp.</quote> (<function role="sql">UTC_TIMESTAMP</function> is
not allowed. Its range of values does not align with those
of the <literal>TIMESTAMP</literal> column anyway unless
the current time zone is <literal>UTC</literal>.)
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.0/functions-core.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 28, Lines Added: 34, Lines Deleted: 34; 9941 bytes
@@ -2835,7 +2835,7 @@
<primary>INSERT()</primary>
</indexterm>
- <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
+ <function role="sql">INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2883,7 +2883,7 @@
<primary>INSTR()</primary>
</indexterm>
- <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
+ <function role="sql">INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2925,7 +2925,7 @@
<primary>LCASE()</primary>
</indexterm>
- <literal>LCASE(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LCASE(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2950,7 +2950,7 @@
<primary>LEFT()</primary>
</indexterm>
- <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
+ <function role="sql">LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2984,7 +2984,7 @@
<primary>LENGTH()</primary>
</indexterm>
- <literal>LENGTH(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LENGTH(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3026,7 +3026,7 @@
<primary>LOAD_FILE()</primary>
</indexterm>
- <literal>LOAD_FILE(<replaceable>file_name</replaceable>)</literal>
+ <function role="sql">LOAD_FILE(<replaceable>file_name</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3076,8 +3076,8 @@
<primary>LOCATE()</primary>
</indexterm>
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>,
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>,
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3428,7 +3428,7 @@
<para>
<literal>POSITION(<replaceable>substr</replaceable> IN
<replaceable>str</replaceable>)</literal> is a synonym for
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>.
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>.
</para>
<remark role="help-description-end"/>
@@ -5827,7 +5827,7 @@
<primary>DIV</primary>
</indexterm>
- <literal>DIV</literal>
+ <function role="sqlop">DIV</function>
</para>
<remark role="help-syntax-end"/>
@@ -6313,7 +6313,7 @@
<primary>CRC32()</primary>
</indexterm>
- <literal>CRC32(<replaceable>expr</replaceable>)</literal>
+ <function role="sql">CRC32(<replaceable>expr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6505,7 +6505,7 @@
<primary>LN()</primary>
</indexterm>
- <literal>LN(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LN(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6532,7 +6532,7 @@
<para>
This function is synonymous with
- <literal>LOG(<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -6546,8 +6546,8 @@
<primary>LOG()</primary>
</indexterm>
- <literal>LOG(<replaceable>X</replaceable>)</literal>,
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>,
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6584,9 +6584,9 @@
</programlisting>
<para>
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
- is equivalent to <literal>LOG(<replaceable>X</replaceable>)
- / LOG(<replaceable>B</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
+ is equivalent to <function role="sql">LOG(<replaceable>X</replaceable>)
+ / LOG(<replaceable>B</replaceable>)</function>.
</para>
</listitem>
@@ -6600,7 +6600,7 @@
<primary>LOG2()</primary>
</indexterm>
- <literal>LOG2(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG2(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6627,8 +6627,8 @@
<function role="sql">LOG2()</function> is useful for finding
out how many bits a number requires for storage. This
function is equivalent to the expression
- <literal>LOG(<replaceable>X</replaceable>) /
- LOG(2)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>) /
+ LOG(2)</function>.
</para>
</listitem>
@@ -6642,7 +6642,7 @@
<primary>LOG10()</primary>
</indexterm>
- <literal>LOG10(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6668,9 +6668,9 @@
</programlisting>
<para>
- <literal>LOG10(<replaceable>X</replaceable>)</literal> is
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function> is
equivalent to
- <literal>LOG(10,<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(10,<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -8919,7 +8919,7 @@
<primary>LAST_DAY()</primary>
</indexterm>
- <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
+ <function role="sql">LAST_DAY(<replaceable>date</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -8958,7 +8958,7 @@
<primary>LOCALTIME</primary>
</indexterm>
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>
</para>
@@ -8967,7 +8967,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIME</literal> and
+ <function role="sql">LOCALTIME</function> and
<function role="sql">LOCALTIME()</function> are synonyms for
<function role="sql">NOW()</function>.
</para>
@@ -8985,7 +8985,7 @@
<primary>LOCALTIMESTAMP</primary>
</indexterm>
- <literal>LOCALTIMESTAMP</literal>,
+ <function role="sql">LOCALTIMESTAMP</function>,
<function role="sql">LOCALTIMESTAMP()</function>
</para>
@@ -8994,7 +8994,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIMESTAMP</literal> and
+ <function role="sql">LOCALTIMESTAMP</function> and
<function role="sql">LOCALTIMESTAMP()</function> are synonyms
for <function role="sql">NOW()</function>.
</para>
@@ -10218,7 +10218,7 @@
<primary>UTC_DATE()</primary>
</indexterm>
- <literal>UTC_DATE</literal>,
+ <function role="sql">UTC_DATE</function>,
<function role="sql">UTC_DATE()</function>
</para>
@@ -10253,7 +10253,7 @@
<primary>UTC_TIME()</primary>
</indexterm>
- <literal>UTC_TIME</literal>,
+ <function role="sql">UTC_TIME</function>,
<function role="sql">UTC_TIME()</function>
</para>
@@ -10288,7 +10288,7 @@
<primary>UTC_TIMESTAMP()</primary>
</indexterm>
- <literal>UTC_TIMESTAMP</literal>,
+ <function role="sql">UTC_TIMESTAMP</function>,
<function role="sql">UTC_TIMESTAMP()</function>
</para>
@@ -15683,7 +15683,7 @@
<primary>IS_FREE_LOCK()</primary>
</indexterm>
- <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_FREE_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -15712,7 +15712,7 @@
<primary>IS_USED_LOCK()</primary>
</indexterm>
- <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_USED_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.1/data-types.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1273 bytes
@@ -3304,13 +3304,13 @@
of its synonyms
(<function role="sql">CURRENT_TIMESTAMP()</function>,
<function role="sql">NOW()</function>,
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>,
- <literal>LOCALTIMESTAMP</literal>, or
+ <function role="sql">LOCALTIMESTAMP</function>, or
<function role="sql">LOCALTIMESTAMP()</function>) can be
used in the <literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ timestamp.</quote> (<function role="sql">UTC_TIMESTAMP</function> is
not allowed. Its range of values does not align with those
of the <literal>TIMESTAMP</literal> column anyway unless
the current time zone is <literal>UTC</literal>.)
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.1/functions-core.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 28, Lines Added: 34, Lines Deleted: 34; 9941 bytes
@@ -2803,7 +2803,7 @@
<primary>INSERT()</primary>
</indexterm>
- <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
+ <function role="sql">INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2851,7 +2851,7 @@
<primary>INSTR()</primary>
</indexterm>
- <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
+ <function role="sql">INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2893,7 +2893,7 @@
<primary>LCASE()</primary>
</indexterm>
- <literal>LCASE(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LCASE(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2918,7 +2918,7 @@
<primary>LEFT()</primary>
</indexterm>
- <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
+ <function role="sql">LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2952,7 +2952,7 @@
<primary>LENGTH()</primary>
</indexterm>
- <literal>LENGTH(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LENGTH(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2994,7 +2994,7 @@
<primary>LOAD_FILE()</primary>
</indexterm>
- <literal>LOAD_FILE(<replaceable>file_name</replaceable>)</literal>
+ <function role="sql">LOAD_FILE(<replaceable>file_name</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3044,8 +3044,8 @@
<primary>LOCATE()</primary>
</indexterm>
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>,
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>,
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3359,7 +3359,7 @@
<para>
<literal>POSITION(<replaceable>substr</replaceable> IN
<replaceable>str</replaceable>)</literal> is a synonym for
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>.
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>.
</para>
<remark role="help-description-end"/>
@@ -5758,7 +5758,7 @@
<primary>DIV</primary>
</indexterm>
- <literal>DIV</literal>
+ <function role="sqlop">DIV</function>
</para>
<remark role="help-syntax-end"/>
@@ -6244,7 +6244,7 @@
<primary>CRC32()</primary>
</indexterm>
- <literal>CRC32(<replaceable>expr</replaceable>)</literal>
+ <function role="sql">CRC32(<replaceable>expr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6436,7 +6436,7 @@
<primary>LN()</primary>
</indexterm>
- <literal>LN(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LN(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6463,7 +6463,7 @@
<para>
This function is synonymous with
- <literal>LOG(<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -6477,8 +6477,8 @@
<primary>LOG()</primary>
</indexterm>
- <literal>LOG(<replaceable>X</replaceable>)</literal>,
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>,
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6515,9 +6515,9 @@
</programlisting>
<para>
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
- is equivalent to <literal>LOG(<replaceable>X</replaceable>)
- / LOG(<replaceable>B</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
+ is equivalent to <function role="sql">LOG(<replaceable>X</replaceable>)
+ / LOG(<replaceable>B</replaceable>)</function>.
</para>
</listitem>
@@ -6531,7 +6531,7 @@
<primary>LOG2()</primary>
</indexterm>
- <literal>LOG2(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG2(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6558,8 +6558,8 @@
<function role="sql">LOG2()</function> is useful for finding
out how many bits a number requires for storage. This
function is equivalent to the expression
- <literal>LOG(<replaceable>X</replaceable>) /
- LOG(2)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>) /
+ LOG(2)</function>.
</para>
</listitem>
@@ -6573,7 +6573,7 @@
<primary>LOG10()</primary>
</indexterm>
- <literal>LOG10(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6599,9 +6599,9 @@
</programlisting>
<para>
- <literal>LOG10(<replaceable>X</replaceable>)</literal> is
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function> is
equivalent to
- <literal>LOG(10,<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(10,<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -8878,7 +8878,7 @@
<primary>LAST_DAY()</primary>
</indexterm>
- <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
+ <function role="sql">LAST_DAY(<replaceable>date</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -8917,7 +8917,7 @@
<primary>LOCALTIME</primary>
</indexterm>
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>
</para>
@@ -8926,7 +8926,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIME</literal> and
+ <function role="sql">LOCALTIME</function> and
<function role="sql">LOCALTIME()</function> are synonyms for
<function role="sql">NOW()</function>.
</para>
@@ -8944,7 +8944,7 @@
<primary>LOCALTIMESTAMP</primary>
</indexterm>
- <literal>LOCALTIMESTAMP</literal>,
+ <function role="sql">LOCALTIMESTAMP</function>,
<function role="sql">LOCALTIMESTAMP()</function>
</para>
@@ -8953,7 +8953,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIMESTAMP</literal> and
+ <function role="sql">LOCALTIMESTAMP</function> and
<function role="sql">LOCALTIMESTAMP()</function> are synonyms
for <function role="sql">NOW()</function>.
</para>
@@ -10167,7 +10167,7 @@
<primary>UTC_DATE()</primary>
</indexterm>
- <literal>UTC_DATE</literal>,
+ <function role="sql">UTC_DATE</function>,
<function role="sql">UTC_DATE()</function>
</para>
@@ -10202,7 +10202,7 @@
<primary>UTC_TIME()</primary>
</indexterm>
- <literal>UTC_TIME</literal>,
+ <function role="sql">UTC_TIME</function>,
<function role="sql">UTC_TIME()</function>
</para>
@@ -10237,7 +10237,7 @@
<primary>UTC_TIMESTAMP()</primary>
</indexterm>
- <literal>UTC_TIMESTAMP</literal>,
+ <function role="sql">UTC_TIMESTAMP</function>,
<function role="sql">UTC_TIMESTAMP()</function>
</para>
@@ -16680,7 +16680,7 @@
<primary>IS_FREE_LOCK()</primary>
</indexterm>
- <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_FREE_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -16709,7 +16709,7 @@
<primary>IS_USED_LOCK()</primary>
</indexterm>
- <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_USED_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.1/partitioning-guide.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 831 bytes
@@ -1808,9 +1808,9 @@
<para>
(For example, suppose that <replaceable>num</replaceable>
- is 13. Then <literal>LOG(2,13)</literal> is
+ is 13. Then <function role="sql">LOG(2,13)</function> is
3.7004397181411.
- <literal>CEILING(3.7004397181411)</literal> is 4, and
+ <function role="sql">CEILING(3.7004397181411)</function> is 4, and
<replaceable>V</replaceable> =
<function role="sql">POWER(2,4)</function>, which is 16.)
</para>
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-5.1/partitioning.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1352 bytes
@@ -1534,9 +1534,9 @@
<para>
(For example, suppose that <replaceable>num</replaceable>
- is 13. Then <literal>LOG(2,13)</literal> is
+ is 13. Then <function role="sql">LOG(2,13)</function> is
3.7004397181411.
- <literal>CEILING(3.7004397181411)</literal> is 4, and
+ <function role="sql">CEILING(3.7004397181411)</function> is 4, and
<replaceable>V</replaceable> =
<function role="sql">POWER(2,4)</function>, which is 16.)
</para>
@@ -4359,9 +4359,10 @@
</formalpara>
<para>
- Beginning with MySQL 5.1.23, the <literal>DIV</literal>
- operator is also supported, and the <literal>/</literal>
- operator is disallowed. (Bug #30188, Bug #33182)
+ Beginning with MySQL 5.1.23, the <function role="sqlop">DIV</function>
+ operator is also supported, and the
+ <function role="sqlop" condition="divide">/</function>
+ operator is disallowed. (Bug #30188, Bug #33182)
</para>
<para>
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-6.0/data-types.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1273 bytes
@@ -3301,13 +3301,13 @@
of its synonyms
(<function role="sql">CURRENT_TIMESTAMP()</function>,
<function role="sql">NOW()</function>,
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>,
- <literal>LOCALTIMESTAMP</literal>, or
+ <function role="sql">LOCALTIMESTAMP</function>, or
<function role="sql">LOCALTIMESTAMP()</function>) can be
used in the <literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ timestamp.</quote> (<function role="sql">UTC_TIMESTAMP</function> is
not allowed. Its range of values does not align with those
of the <literal>TIMESTAMP</literal> column anyway unless
the current time zone is <literal>UTC</literal>.)
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-6.0/functions-core.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 28, Lines Added: 34, Lines Deleted: 34; 9941 bytes
@@ -2803,7 +2803,7 @@
<primary>INSERT()</primary>
</indexterm>
- <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
+ <function role="sql">INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2851,7 +2851,7 @@
<primary>INSTR()</primary>
</indexterm>
- <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
+ <function role="sql">INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2893,7 +2893,7 @@
<primary>LCASE()</primary>
</indexterm>
- <literal>LCASE(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LCASE(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2918,7 +2918,7 @@
<primary>LEFT()</primary>
</indexterm>
- <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
+ <function role="sql">LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2952,7 +2952,7 @@
<primary>LENGTH()</primary>
</indexterm>
- <literal>LENGTH(<replaceable>str</replaceable>)</literal>
+ <function role="sql">LENGTH(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -2994,7 +2994,7 @@
<primary>LOAD_FILE()</primary>
</indexterm>
- <literal>LOAD_FILE(<replaceable>file_name</replaceable>)</literal>
+ <function role="sql">LOAD_FILE(<replaceable>file_name</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3043,8 +3043,8 @@
<primary>LOCATE()</primary>
</indexterm>
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>,
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</literal>
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>,
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>,<replaceable>pos</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -3358,7 +3358,7 @@
<para>
<literal>POSITION(<replaceable>substr</replaceable> IN
<replaceable>str</replaceable>)</literal> is a synonym for
- <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>.
+ <function role="sql">LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</function>.
</para>
<remark role="help-description-end"/>
@@ -6094,7 +6094,7 @@
<primary>DIV</primary>
</indexterm>
- <literal>DIV</literal>
+ <function role="sqlop">DIV</function>
</para>
<remark role="help-syntax-end"/>
@@ -6580,7 +6580,7 @@
<primary>CRC32()</primary>
</indexterm>
- <literal>CRC32(<replaceable>expr</replaceable>)</literal>
+ <function role="sql">CRC32(<replaceable>expr</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6772,7 +6772,7 @@
<primary>LN()</primary>
</indexterm>
- <literal>LN(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LN(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6799,7 +6799,7 @@
<para>
This function is synonymous with
- <literal>LOG(<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -6813,8 +6813,8 @@
<primary>LOG()</primary>
</indexterm>
- <literal>LOG(<replaceable>X</replaceable>)</literal>,
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG(<replaceable>X</replaceable>)</function>,
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6851,9 +6851,9 @@
</programlisting>
<para>
- <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
- is equivalent to <literal>LOG(<replaceable>X</replaceable>)
- / LOG(<replaceable>B</replaceable>)</literal>.
+ <function role="sql">LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</function>
+ is equivalent to <function role="sql">LOG(<replaceable>X</replaceable>)
+ / LOG(<replaceable>B</replaceable>)</function>.
</para>
</listitem>
@@ -6867,7 +6867,7 @@
<primary>LOG2()</primary>
</indexterm>
- <literal>LOG2(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG2(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6894,8 +6894,8 @@
<function role="sql">LOG2()</function> is useful for finding
out how many bits a number requires for storage. This
function is equivalent to the expression
- <literal>LOG(<replaceable>X</replaceable>) /
- LOG(2)</literal>.
+ <function role="sql">LOG(<replaceable>X</replaceable>) /
+ LOG(2)</function>.
</para>
</listitem>
@@ -6909,7 +6909,7 @@
<primary>LOG10()</primary>
</indexterm>
- <literal>LOG10(<replaceable>X</replaceable>)</literal>
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -6935,9 +6935,9 @@
</programlisting>
<para>
- <literal>LOG10(<replaceable>X</replaceable>)</literal> is
+ <function role="sql">LOG10(<replaceable>X</replaceable>)</function> is
equivalent to
- <literal>LOG(10,<replaceable>X</replaceable>)</literal>.
+ <function role="sql">LOG(10,<replaceable>X</replaceable>)</function>.
</para>
</listitem>
@@ -9201,7 +9201,7 @@
<primary>LAST_DAY()</primary>
</indexterm>
- <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
+ <function role="sql">LAST_DAY(<replaceable>date</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -9240,7 +9240,7 @@
<primary>LOCALTIME</primary>
</indexterm>
- <literal>LOCALTIME</literal>,
+ <function role="sql">LOCALTIME</function>,
<function role="sql">LOCALTIME()</function>
</para>
@@ -9249,7 +9249,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIME</literal> and
+ <function role="sql">LOCALTIME</function> and
<function role="sql">LOCALTIME()</function> are synonyms for
<function role="sql">NOW()</function>.
</para>
@@ -9267,7 +9267,7 @@
<primary>LOCALTIMESTAMP</primary>
</indexterm>
- <literal>LOCALTIMESTAMP</literal>,
+ <function role="sql">LOCALTIMESTAMP</function>,
<function role="sql">LOCALTIMESTAMP()</function>
</para>
@@ -9276,7 +9276,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>LOCALTIMESTAMP</literal> and
+ <function role="sql">LOCALTIMESTAMP</function> and
<function role="sql">LOCALTIMESTAMP()</function> are synonyms
for <function role="sql">NOW()</function>.
</para>
@@ -10490,7 +10490,7 @@
<primary>UTC_DATE()</primary>
</indexterm>
- <literal>UTC_DATE</literal>,
+ <function role="sql">UTC_DATE</function>,
<function role="sql">UTC_DATE()</function>
</para>
@@ -10525,7 +10525,7 @@
<primary>UTC_TIME()</primary>
</indexterm>
- <literal>UTC_TIME</literal>,
+ <function role="sql">UTC_TIME</function>,
<function role="sql">UTC_TIME()</function>
</para>
@@ -10560,7 +10560,7 @@
<primary>UTC_TIMESTAMP()</primary>
</indexterm>
- <literal>UTC_TIMESTAMP</literal>,
+ <function role="sql">UTC_TIMESTAMP</function>,
<function role="sql">UTC_TIMESTAMP()</function>
</para>
@@ -16982,7 +16982,7 @@
<primary>IS_FREE_LOCK()</primary>
</indexterm>
- <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_FREE_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
@@ -17011,7 +17011,7 @@
<primary>IS_USED_LOCK()</primary>
</indexterm>
- <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
+ <function role="sql">IS_USED_LOCK(<replaceable>str</replaceable>)</function>
</para>
<remark role="help-syntax-end"/>
Modified: trunk/refman-6.0/partitioning-guide.xml
===================================================================
--- trunk/refman-6.0/partitioning-guide.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-6.0/partitioning-guide.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 831 bytes
@@ -1777,9 +1777,9 @@
<para>
(For example, suppose that <replaceable>num</replaceable>
- is 13. Then <literal>LOG(2,13)</literal> is
+ is 13. Then <function role="sql">LOG(2,13)</function> is
3.7004397181411.
- <literal>CEILING(3.7004397181411)</literal> is 4, and
+ <function role="sql">CEILING(3.7004397181411)</function> is 4, and
<replaceable>V</replaceable> =
<function role="sql">POWER(2,4)</function>, which is 16.)
</para>
Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml 2008-01-09 19:14:38 UTC (rev 9535)
+++ trunk/refman-6.0/partitioning.xml 2008-01-09 19:14:57 UTC (rev 9536)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1187 bytes
@@ -1501,9 +1501,9 @@
<para>
(For example, suppose that <replaceable>num</replaceable>
- is 13. Then <literal>LOG(2,13)</literal> is
+ is 13. Then <function role="sql">LOG(2,13)</function> is
3.7004397181411.
- <literal>CEILING(3.7004397181411)</literal> is 4, and
+ <function role="sql">CEILING(3.7004397181411)</function> is 4, and
<replaceable>V</replaceable> =
<function role="sql">POWER(2,4)</function>, which is 16.)
</para>
@@ -4260,7 +4260,7 @@
</formalpara>
<para>
- Beginning with MySQL 6.0.4, the <literal>DIV</literal>
+ Beginning with MySQL 6.0.4, the <function role="sqlop">DIV</function>
operator is also supported, and the
<function role="sqlop" condition="divide">/</function>
operator is disallowed. (Bug #30188, Bug #33182)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9536 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 9 Jan |
