Author: paul
Date: 2007-12-04 04:31:54 +0100 (Tue, 04 Dec 2007)
New Revision: 9087
Log:
r27716@frost: paul | 2007-12-03 21:31:30 -0600
Add markup.
Modified:
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/errors-problems.xml
trunk/refman-4.1/extending-mysql.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/language-structure.xml
trunk/refman-4.1/news-3.19.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/sql-syntax.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33765
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27714
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33765
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27716
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/data-types.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 870 bytes
@@ -3350,10 +3350,10 @@
<para>
If you need to print the timestamps for external
- applications, you can use <literal>MID()</literal> to
- extract the relevant part of the timestamp: for example,
- to imitate the <literal>TIMESTAMP(4)</literal> display
- format.
+ applications, you can use
+ <function role="sql">MID()</function> to extract the
+ relevant part of the timestamp: for example, to imitate
+ the <literal>TIMESTAMP(4)</literal> display format.
</para>
</listitem>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/dba-core.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 1474 bytes
@@ -8946,9 +8946,9 @@
Treat
<function role="sqlop" condition="operator_or">||</function>
as a string concatenation operator (same as
- <literal>CONCAT()</literal>) rather than as a synonym for
- <function role="sqlop">OR</function>. (Added in MySQL
- 4.0.0)
+ <function role="sql">CONCAT()</function>) rather than as a
+ synonym for <function role="sqlop">OR</function>. (Added
+ in MySQL 4.0.0)
</para>
</listitem>
@@ -16326,10 +16326,11 @@
<para>
(Note that if you are running a version of MySQL older than
- 3.23.11, the output from <literal>USER()</literal> does not
- include the hostname. In this case, you must restart the
- server with the <option>--log</option> option, then obtain
- the hostname from the log.)
+ 3.23.11, the output from
+ <function role="sql">USER()</function> does not include the
+ hostname. In this case, you must restart the server with the
+ <option>--log</option> option, then obtain the hostname from
+ the log.)
</para>
<para>
Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/errors-problems.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 848 bytes
@@ -5234,8 +5234,9 @@
<literal>lower_case_table_names=2</literal> (which enables
MySQL to remember the case used for databases and table
names), MySQL does not remember the case used for database
- names for the function <literal>DATABASE()</literal> or
- within the various logs (on case-insensitive systems).
+ names for the function
+ <function role="sql">DATABASE()</function> or within the
+ various logs (on case-insensitive systems).
</para>
</listitem>
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/extending-mysql.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 991 bytes
@@ -358,7 +358,8 @@
<para>
Whichever method you use to add new functions, they can be invoked
in SQL statements just like native functions such as
- <literal>ABS()</literal> or <literal>SOUNDEX()</literal>.
+ <function role="sql">ABS()</function> or
+ <function role="sql">SOUNDEX()</function>.
</para>
<para>
@@ -482,7 +483,8 @@
<para>
A user-defined function (UDF) is a way to extend MySQL with a
new function that works like a native (built-in) MySQL function
- such as <literal>ABS()</literal> or <literal>CONCAT()</literal>.
+ such as <function role="sql">ABS()</function> or
+ <function role="sql">CONCAT()</function>.
</para>
<para>
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/functions-core.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 32, Lines Added: 119, Lines Deleted: 111; 20620 bytes
@@ -434,9 +434,9 @@
<para>
To convert a value to a specific type for comparison purposes,
- you can use the <literal>CAST()</literal> function. String
- values can be converted to a different character set using
- <literal>CONVERT()</literal>. See
+ you can use the <function role="sql">CAST()</function> function.
+ String values can be converted to a different character set
+ using <function role="sql">CONVERT()</function>. See
<xref linkend="cast-functions"/>.
</para>
@@ -935,10 +935,11 @@
<para>
For best results when using
<function role="sqlop">BETWEEN</function> with date or time
- values, you should use <literal>CAST()</literal> to
- explicitly convert the values to the desired data type.
- Examples: If you compare a <literal>DATETIME</literal> to
- two <literal>DATE</literal> values, convert the
+ values, you should use
+ <function role="sql">CAST()</function> to explicitly convert
+ the values to the desired data type. Examples: If you
+ compare a <literal>DATETIME</literal> to two
+ <literal>DATE</literal> values, convert the
<literal>DATE</literal> values to
<literal>DATETIME</literal> values. If you use a string
constant such as <literal>'2001-1-1'</literal> in a
@@ -2325,8 +2326,9 @@
</programlisting>
<para>
- <literal>CONCAT()</literal> returns <literal>NULL</literal> if
- any argument is <literal>NULL</literal>.
+ <function role="sql">CONCAT()</function> returns
+ <literal>NULL</literal> if any argument is
+ <literal>NULL</literal>.
</para>
<remark role="help-description-end"/>
@@ -2361,11 +2363,11 @@
<remark role="help-description-begin"/>
<para>
- <literal>CONCAT_WS()</literal> stands for Concatenate With
- Separator and is a special form of
- <literal>CONCAT()</literal>. The first argument is the
- separator for the rest of the arguments. The separator is
- added between the strings to be concatenated. The separator
+ <function role="sql">CONCAT_WS()</function> stands for
+ Concatenate With Separator and is a special form of
+ <function role="sql">CONCAT()</function>. The first argument
+ is the separator for the rest of the arguments. The separator
+ is added between the strings to be concatenated. The separator
can be a string, as can the rest of the arguments. If the
separator is <literal>NULL</literal>, the result is
<literal>NULL</literal>.
@@ -2383,10 +2385,11 @@
</programlisting>
<para>
- <literal>CONCAT_WS()</literal> skips any
+ <function role="sql">CONCAT_WS()</function> skips any
<literal>NULL</literal> values after the separator argument.
- Before MySQL 4.0.14, <literal>CONCAT_WS()</literal> skips
- empty strings as well as <literal>NULL</literal> values.
+ Before MySQL 4.0.14,
+ <function role="sql">CONCAT_WS()</function> skips empty
+ strings as well as <literal>NULL</literal> values.
</para>
</listitem>
@@ -3531,8 +3534,8 @@
Returns a soundex string from <replaceable>str</replaceable>.
Two strings that sound almost the same should have identical
soundex strings. A standard soundex string is four characters
- long, but the <literal>SOUNDEX()</literal> function returns an
- arbitrarily long string. You can use
+ long, but the <function role="sql">SOUNDEX()</function>
+ function returns an arbitrarily long string. You can use
<literal>SUBSTRING()</literal> on the result to get a standard
soundex string. All non-alphabetic characters in
<replaceable>str</replaceable> are ignored. All international
@@ -3542,8 +3545,8 @@
<important>
<para>
- When using <literal>SOUNDEX()</literal>, you should be aware
- of the following limitations:
+ When using <function role="sql">SOUNDEX()</function>, you
+ should be aware of the following limitations:
</para>
</important>
@@ -5636,8 +5639,8 @@
Modulo operation. Returns the remainder of
<replaceable>N</replaceable> divided by
<replaceable>M</replaceable>. For more information, see the
- description for the <literal>MOD()</literal> function in
- <xref linkend="mathematical-functions"/>.
+ description for the <function role="sql">MOD()</function>
+ function in <xref linkend="mathematical-functions"/>.
</para>
<remark role="help-description-end"/>
@@ -6452,9 +6455,9 @@
</para>
<para>
- As of MySQL 4.1.7, <literal>MOD()</literal> works on values
- that have a fractional part and returns the exact remainder
- after division:
+ As of MySQL 4.1.7, <function role="sql">MOD()</function>
+ works on values that have a fractional part and returns the
+ exact remainder after division:
</para>
<programlisting>
@@ -6463,9 +6466,9 @@
</programlisting>
<para>
- Before MySQL 4.1.7, <literal>MOD()</literal> rounds
- arguments with a fractional value to integers and returns an
- integer result:
+ Before MySQL 4.1.7, <function role="sql">MOD()</function>
+ rounds arguments with a fractional value to integers and
+ returns an integer result:
</para>
<programlisting>
@@ -12512,11 +12515,11 @@
<remark role="help-description-begin"/>
<para>
- The <literal>CAST()</literal> function takes a value of one
- type and produce a value of another type, similar to
- <function role="sql">CONVERT()</function>. See the description
- of <function role="sql">CONVERT()</function> for more
- information.
+ The <function role="sql">CAST()</function> function takes a
+ value of one type and produce a value of another type, similar
+ to <function role="sql">CONVERT()</function>. See the
+ description of <function role="sql">CONVERT()</function> for
+ more information.
</para>
<remark role="help-description-end"/>
@@ -12546,9 +12549,9 @@
<remark role="help-description-begin"/>
<para>
- The <literal>CONVERT()</literal> and <literal>CAST()</literal>
- functions take a value of one type and produce a value of
- another type.
+ The <function role="sql">CONVERT()</function> and
+ <function role="sql">CAST()</function> functions take a value
+ of one type and produce a value of another type.
</para>
<para>
@@ -12621,28 +12624,29 @@
</para>
<para>
- <literal>CAST()</literal> and <literal>CONVERT()</literal> are
- available as of MySQL 4.0.2. The <literal>CHAR</literal>
- conversion type is available as of 4.0.6. The
- <literal>USING</literal> form of <literal>CONVERT()</literal>
- is available as of 4.1.0.
+ <function role="sql">CAST()</function> and
+ <function role="sql">CONVERT()</function> are available as of
+ MySQL 4.0.2. The <literal>CHAR</literal> conversion type is
+ available as of 4.0.6. The <literal>USING</literal> form of
+ <function role="sql">CONVERT()</function> is available as of
+ 4.1.0.
</para>
<para>
- <literal>CAST()</literal> and <literal>CONVERT(... USING
- ...)</literal> are standard SQL syntax. The
- non-<literal>USING</literal> form of
- <literal>CONVERT()</literal> is ODBC syntax.
+ <function role="sql">CAST()</function> and
+ <literal>CONVERT(... USING ...)</literal> are standard SQL
+ syntax. The non-<literal>USING</literal> form of
+ <function role="sql">CONVERT()</function> is ODBC syntax.
</para>
<para>
- <literal>CONVERT()</literal> with <literal>USING</literal> is
- used to convert data between different character sets. In
- MySQL, transcoding names are the same as the corresponding
- character set names. For example, this statement converts the
- string <literal>'abc'</literal> in the default character set
- to the corresponding string in the <literal>utf8</literal>
- character set:
+ <function role="sql">CONVERT()</function> with
+ <literal>USING</literal> is used to convert data between
+ different character sets. In MySQL, transcoding names are the
+ same as the corresponding character set names. For example,
+ this statement converts the string <literal>'abc'</literal> in
+ the default character set to the corresponding string in the
+ <literal>utf8</literal> character set:
</para>
<programlisting>
@@ -12684,10 +12688,10 @@
For MySQL 4.1.1 and up, binary strings have no character set,
and thus no concept of lettercase. To perform a
case-insensitive comparison, use the
- <literal>CONVERT()</literal> function to convert the value to
- a non-binary string. If the character set of the result has a
- case-insensitive collation, the <literal>LIKE</literal>
- operation is not case sensitive:
+ <function role="sql">CONVERT()</function> function to convert
+ the value to a non-binary string. If the character set of the
+ result has a case-insensitive collation, the
+ <literal>LIKE</literal> operation is not case sensitive:
</para>
<programlisting>
@@ -12699,16 +12703,16 @@
<literal>latin1</literal> in the preceding statement. To
ensure that a case-insensitive collation is used, specify a
<literal>COLLATE</literal> clause following the
- <literal>CONVERT()</literal> call.
+ <function role="sql">CONVERT()</function> call.
</para>
</listitem>
</itemizedlist>
<para>
- <literal>CONVERT()</literal> can be used more generally for
- comparing strings that are represented in different character
- sets.
+ <function role="sql">CONVERT()</function> can be used more
+ generally for comparing strings that are represented in different
+ character sets.
</para>
<para>
@@ -12746,7 +12750,7 @@
<note>
<para>
- In MySQL 4.0, a <literal>CAST()</literal> to
+ In MySQL 4.0, a <function role="sql">CAST()</function> to
<literal>DATE</literal>, <literal>DATETIME</literal>, or
<literal>TIME</literal> only marks the column to be a specific
type but does not change the value of the column.
@@ -12765,15 +12769,17 @@
</programlisting>
<para>
- As of MySQL 4.1.1, <literal>CAST()</literal> also changes the
- result if you use it as part of a more complex expression such as
- <literal>CONCAT('Date: ',CAST(NOW() AS DATE))</literal>.
+ As of MySQL 4.1.1, <function role="sql">CAST()</function> also
+ changes the result if you use it as part of a more complex
+ expression such as <literal>CONCAT('Date: ',CAST(NOW() AS
+ DATE))</literal>.
</para>
<para>
- You should not use <literal>CAST()</literal> to extract data in
- different formats but instead use string functions like
- <literal>LEFT()</literal> or <literal>EXTRACT()</literal>. See
+ You should not use <function role="sql">CAST()</function> to
+ extract data in different formats but instead use string functions
+ like <function role="sql">LEFT()</function> or
+ <literal>EXTRACT()</literal>. See
<xref linkend="date-and-time-functions"/>.
</para>
@@ -12836,10 +12842,10 @@
The handing of unsigned values was changed in MySQL 4.0 to be able
to support <literal>BIGINT</literal> values properly. If you have
some code that you want to run in both MySQL 4.0 and 3.23, you
- probably cannot use the <literal>CAST()</literal> function. You
- can use the following technique to get a signed result when
- subtracting two unsigned integer columns <literal>ucol1</literal>
- and <literal>ucol2</literal>:
+ probably cannot use the <function role="sql">CAST()</function>
+ function. You can use the following technique to get a signed
+ result when subtracting two unsigned integer columns
+ <literal>ucol1</literal> and <literal>ucol2</literal>:
</para>
<programlisting>
@@ -14112,13 +14118,13 @@
<remark role="help-description-begin"/>
<para>
- The <literal>BENCHMARK()</literal> function executes the
- expression <replaceable>expr</replaceable> repeatedly
- <replaceable>count</replaceable> times. It may be used to
- time how quickly MySQL processes the expression. The result
- value is always <literal>0</literal>. The intended use is
- from within the <command>mysql</command> client, which
- reports query execution times:
+ The <function role="sql">BENCHMARK()</function> function
+ executes the expression <replaceable>expr</replaceable>
+ repeatedly <replaceable>count</replaceable> times. It may be
+ used to time how quickly MySQL processes the expression. The
+ result value is always <literal>0</literal>. The intended
+ use is from within the <command>mysql</command> client,
+ which reports query execution times:
</para>
<remark role="help-description-end"/>
@@ -14138,16 +14144,16 @@
<para>
The time reported is elapsed time on the client end, not CPU
time on the server end. It is advisable to execute
- <literal>BENCHMARK()</literal> several times, and to
- interpret the result with regard to how heavily loaded the
- server machine is.
+ <function role="sql">BENCHMARK()</function> several times,
+ and to interpret the result with regard to how heavily
+ loaded the server machine is.
</para>
<para>
- <literal>BENCHMARK()</literal> is intended for measuring the
- runtime performance of scalar expressions, which has some
- significant implications for the way that you use it and
- interpret the results:
+ <function role="sql">BENCHMARK()</function> is intended for
+ measuring the runtime performance of scalar expressions,
+ which has some significant implications for the way that you
+ use it and interpret the results:
</para>
<itemizedlist>
@@ -14182,11 +14188,11 @@
allocated are reused, and runtime optimizations such as
local caching of results already evaluated for aggregate
functions can alter the results. Use of
- <literal>BENCHMARK()</literal> thus measures performance
- of the runtime component by giving more weight to that
- component and removing the <quote>noise</quote>
- introduced by the network, parser, optimizer, and so
- forth.
+ <function role="sql">BENCHMARK()</function> thus
+ measures performance of the runtime component by giving
+ more weight to that component and removing the
+ <quote>noise</quote> introduced by the network, parser,
+ optimizer, and so forth.
</para>
</listitem>
@@ -14301,7 +14307,7 @@
<row>
<entry><literal>3</literal></entry>
<entry>System constant</entry>
- <entry><literal>USER()</literal> return value</entry>
+ <entry><function role="sql">USER()</function> return value</entry>
</row>
<row>
<entry><literal>4</literal></entry>
@@ -14321,7 +14327,8 @@
<para>
Before MySQL 4.1.11, the return values are shown in
following table, and functions such as
- <literal>USER()</literal> have a coercibility of 2.
+ <function role="sql">USER()</function> have a coercibility
+ of 2.
</para>
<informaltable>
@@ -14486,12 +14493,12 @@
<para>
The example illustrates that although the client specified a
username of <literal>davida</literal> (as indicated by the
- value of the <literal>USER()</literal> function), the server
- authenticated the client using an anonymous user account (as
- seen by the empty username part of the
- <function role="sql">CURRENT_USER()</function> value). One
- way this might occur is that there is no account listed in
- the grant tables for <literal>davida</literal>.
+ value of the <function role="sql">USER()</function>
+ function), the server authenticated the client using an
+ anonymous user account (as seen by the empty username part
+ of the <function role="sql">CURRENT_USER()</function>
+ value). One way this might occur is that there is no account
+ listed in the grant tables for <literal>davida</literal>.
</para>
<para>
@@ -14511,7 +14518,7 @@
<primary>DATABASE()</primary>
</indexterm>
- <literal>DATABASE()</literal>
+ <function role="sql">DATABASE()</function>
</para>
<remark role="help-syntax-end"/>
@@ -14522,7 +14529,7 @@
Returns the default (current) database name. As of MySQL
4.1, the string uses the <literal>utf8</literal> character
set. If there is no default database,
- <literal>DATABASE()</literal> returns
+ <function role="sql">DATABASE()</function> returns
<literal>NULL</literal> as of MySQL 4.1.1, and the empty
string before that.
</para>
@@ -14975,7 +14982,7 @@
<para>
<literal>SESSION_USER()</literal> is a synonym for
- <literal>USER()</literal>.
+ <function role="sql">USER()</function>.
</para>
<remark role="help-description-end"/>
@@ -15000,7 +15007,7 @@
<para>
<literal>SYSTEM_USER()</literal> is a synonym for
- <literal>USER()</literal>.
+ <function role="sql">USER()</function>.
</para>
<remark role="help-description-end"/>
@@ -15016,7 +15023,7 @@
<primary>USER()</primary>
</indexterm>
- <literal>USER()</literal>
+ <function role="sql">USER()</function>
</para>
<remark role="help-syntax-end"/>
@@ -15056,10 +15063,11 @@
</programlisting>
<para>
- As of MySQL 4.1, <literal>USER()</literal> returns a value
- in the <literal>utf8</literal> character set, so you should
- also make sure that the <literal>'@'</literal> string
- literal is interpreted in that character set:
+ As of MySQL 4.1, <function role="sql">USER()</function>
+ returns a value in the <literal>utf8</literal> character
+ set, so you should also make sure that the
+ <literal>'@'</literal> string literal is interpreted in that
+ character set:
</para>
<programlisting>
@@ -15078,7 +15086,7 @@
<primary>VERSION()</primary>
</indexterm>
- <literal>VERSION()</literal>
+ <function role="sql">VERSION()</function>
</para>
<remark role="help-syntax-end"/>
@@ -16147,8 +16155,8 @@
</para>
<para>
- See also <literal>CONCAT()</literal> and
- <literal>CONCAT_WS()</literal>:
+ See also <function role="sql">CONCAT()</function> and
+ <function role="sql">CONCAT_WS()</function>:
<xref linkend="string-functions"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/installing.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1082 bytes
@@ -13046,8 +13046,8 @@
strings instead of numbers. This fixes some problems with
character sets where it is convenient to input a string as a
binary value. With this change, you should use
- <literal>CAST()</literal> if you want to compare binary
- values numerically as integers:
+ <function role="sql">CAST()</function> if you want to
+ compare binary values numerically as integers:
</para>
<programlisting>
@@ -13057,8 +13057,8 @@
</programlisting>
<para>
- If you do not use <literal>CAST()</literal>, a lexical
- string comparison is made instead:
+ If you do not use <function role="sql">CAST()</function>, a
+ lexical string comparison is made instead:
</para>
<programlisting>
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/language-structure.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 668 bytes
@@ -1615,7 +1615,8 @@
invoked because the parser resolves invocations of the function
to refer to the built-in function. For example, if you create a
UDF named <literal>ABS</literal>, references to
- <literal>ABS()</literal> invoke the built-in function.
+ <function role="sql">ABS()</function> invoke the built-in
+ function.
</para>
<para>
Modified: trunk/refman-4.1/news-3.19.xml
===================================================================
--- trunk/refman-4.1/news-3.19.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-3.19.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 742 bytes
@@ -157,8 +157,8 @@
on <literal>BLOB</literal> columns does not yet work as
expected (probably it groups/sorts by the first 7 characters
in the <literal>BLOB</literal>). Grouping on formulas with a
- fixed string size (use <literal>MID()</literal> on a
- <literal>BLOB</literal>) should work.
+ fixed string size (use <function role="sql">MID()</function>
+ on a <literal>BLOB</literal>) should work.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.20.xml
===================================================================
--- trunk/refman-4.1/news-3.20.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-3.20.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 496 bytes
@@ -1260,7 +1260,7 @@
<listitem>
<para>
- Bug fixes in <literal>CONCAT()</literal> and
+ Bug fixes in <function role="sql">CONCAT()</function> and
<literal>WEEKDAY()</literal>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.21.xml
===================================================================
--- trunk/refman-4.1/news-3.21.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-3.21.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 822 bytes
@@ -255,7 +255,7 @@
<listitem>
<para>
Fixed <literal>SELECT</literal> problem with
- <literal>LEFT()</literal> when using the
+ <function role="sql">LEFT()</function> when using the
<literal>czech</literal> character set.
</para>
</listitem>
@@ -1612,8 +1612,8 @@
<listitem>
<para>
- Added function <literal>VERSION()</literal> to make easier
- logs.
+ Added function <function role="sql">VERSION()</function> to
+ make easier logs.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-3.22.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 9; 1847 bytes
@@ -310,8 +310,9 @@
<listitem>
<para>
- Fixed core dump problem when using <literal>CONCAT()</literal>
- in a <literal>WHERE</literal> clause.
+ Fixed core dump problem when using
+ <function role="sql">CONCAT()</function> in a
+ <literal>WHERE</literal> clause.
</para>
</listitem>
@@ -611,7 +612,8 @@
<listitem>
<para>
- Fixed bug in <literal>CONCAT()</literal> with many arguments.
+ Fixed bug in <function role="sql">CONCAT()</function> with
+ many arguments.
</para>
</listitem>
@@ -1219,9 +1221,9 @@
<listitem>
<para>
- Changed <literal>USER()</literal> to return a value in
- <literal>user@host</literal> format. Formerly it returned only
- <literal>user</literal>.
+ Changed <function role="sql">USER()</function> to return a
+ value in <literal>user@host</literal> format. Formerly it
+ returned only <literal>user</literal>.
</para>
</listitem>
@@ -1346,9 +1348,9 @@
<para>
Changed <literal>+</literal>, <literal>-</literal> (sign and
minus), <literal>*</literal>, <literal>/</literal>,
- <literal>%</literal>, <literal>ABS()</literal> and
- <literal>MOD()</literal> to be <literal>BIGINT</literal> aware
- (64-bit safe).
+ <literal>%</literal>, <function role="sql">ABS()</function>
+ and <function role="sql">MOD()</function> to be
+ <literal>BIGINT</literal> aware (64-bit safe).
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-3.23.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 7; 1460 bytes
@@ -1283,8 +1283,8 @@
<listitem>
<para>
- Fixed bug in <literal>CONCAT_WS()</literal> that cut the
- result.
+ Fixed bug in <function role="sql">CONCAT_WS()</function> that
+ cut the result.
</para>
</listitem>
@@ -1438,7 +1438,7 @@
<listitem>
<para>
Added <literal>@@VERSION</literal> as a synonym for
- <literal>VERSION()</literal>.
+ <function role="sql">VERSION()</function>.
</para>
</listitem>
@@ -3308,8 +3308,8 @@
<listitem>
<para>
- Fixed a bug in <literal>CONCAT_WS()</literal> where it
- returned incorrect results.
+ Fixed a bug in <function role="sql">CONCAT_WS()</function>
+ where it returned incorrect results.
</para>
</listitem>
@@ -6679,8 +6679,9 @@
<listitem>
<para>
- Fixed a bug in <literal>CONCAT()</literal> where one of the
- arguments was a function that returned a modified argument.
+ Fixed a bug in <function role="sql">CONCAT()</function> where
+ one of the arguments was a function that returned a modified
+ argument.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/news-4.0.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 4, Lines Added: 12, Lines Deleted: 10; 2144 bytes
@@ -2505,8 +2505,9 @@
<listitem>
<para>
- Fixed <literal>SOUNDEX()</literal> to ignore non-alphabetic
- characters also in the beginning of the string. (Bug #3556)
+ Fixed <function role="sql">SOUNDEX()</function> to ignore
+ non-alphabetic characters also in the beginning of the string.
+ (Bug #3556)
</para>
</listitem>
@@ -4789,8 +4790,8 @@
<listitem>
<para>
- The <literal>CONCAT_WS()</literal> function no longer skips
- empty strings. (Bug #586).
+ The <function role="sql">CONCAT_WS()</function> function no
+ longer skips empty strings. (Bug #586).
</para>
</listitem>
@@ -6010,10 +6011,11 @@
<listitem>
<para>
Fixed a bug when an updating query using
- <literal>USER()</literal> was replicated on the slave; this
- caused a segmentation fault on the slave. (Bug #178).
- <literal>USER()</literal> is still badly replicated on the
- slave (it is replicated to <literal>""</literal>).
+ <function role="sql">USER()</function> was replicated on the
+ slave; this caused a segmentation fault on the slave. (Bug
+ #178). <function role="sql">USER()</function> is still badly
+ replicated on the slave (it is replicated to
+ <literal>""</literal>).
</para>
</listitem>
@@ -9028,8 +9030,8 @@
<listitem>
<para>
- Added <literal>CAST()</literal> and
- <literal>CONVERT()</literal> functions. The
+ Added <function role="sql">CAST()</function> and
+ <function role="sql">CONVERT()</function> functions. The
<literal>CAST</literal> and <literal>CONVERT</literal>
functions are nearly identical and mainly useful when you want
to create a column with a specific type in a <literal>CREATE
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/optimization.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 2402 bytes
@@ -621,7 +621,7 @@
<para>
If your problem is with a specific MySQL expression or function,
you can perform a timing test by invoking the
- <literal>BENCHMARK()</literal> function using the
+ <function role="sql">BENCHMARK()</function> function using the
<command>mysql</command> client program. Its syntax is
<literal>BENCHMARK(<replaceable>loop_count</replaceable>,<replaceable>expression</replaceable>)</literal>.
The return value is always zero, but <command>mysql</command>
@@ -647,9 +647,9 @@
<para>
All MySQL functions should be highly optimized, but there may be
- some exceptions. <literal>BENCHMARK()</literal> is an excellent
- tool for finding out if some function is a problem for your
- queries.
+ some exceptions. <function role="sql">BENCHMARK()</function> is an
+ excellent tool for finding out if some function is a problem for
+ your queries.
</para>
<section id="explain">
@@ -8119,7 +8119,7 @@
<colspec colwidth="33*"/>
<tbody>
<row>
- <entry><literal>BENCHMARK()</literal></entry>
+ <entry><function role="sql">BENCHMARK()</function></entry>
<entry><literal>CONNECTION_ID()</literal></entry>
<entry><literal>CONVERT_TZ()</literal></entry>
</row>
@@ -8131,7 +8131,7 @@
<row>
<entry><literal>CURRENT_TIMESTAMP()</literal></entry>
<entry><literal>CURTIME()</literal></entry>
- <entry><literal>DATABASE()</literal></entry>
+ <entry><function role="sql">DATABASE()</function></entry>
</row>
<row>
<entry><function role="sql">ENCRYPT()</function> with one parameter</entry>
@@ -8154,7 +8154,7 @@
<entry><literal>UNIX_TIMESTAMP()</literal> with no parameters</entry>
</row>
<row>
- <entry><literal>USER()</literal></entry>
+ <entry><function role="sql">USER()</function></entry>
<entry/>
<entry/>
</row>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/sql-syntax.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 5; 1384 bytes
@@ -9533,9 +9533,10 @@
<para>
These tricks might cause programs to go faster or slower.
- Using MySQL facilities like the <literal>BENCHMARK()</literal>
- function, you can get an idea about what helps in your own
- situation. See <xref linkend="information-functions"/>.
+ Using MySQL facilities like the
+ <function role="sql">BENCHMARK()</function> function, you can
+ get an idea about what helps in your own situation. See
+ <xref linkend="information-functions"/>.
</para>
<para>
@@ -9713,8 +9714,9 @@
<para>
The third option is to use interactive SQL to construct a
set of <literal>DELETE</literal> statements automatically,
- using the MySQL extension <literal>CONCAT()</literal> (in
- lieu of the standard
+ using the MySQL extension
+ <function role="sql">CONCAT()</function> (in lieu of the
+ standard
<function role="sqlop" condition="operator_or">||</function>
operator). For example:
</para>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-4.1/tutorial.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 9; 2248 bytes
@@ -1731,11 +1731,12 @@
<para>
Here, <literal>YEAR()</literal> pulls out the year part of a
- date and <literal>RIGHT()</literal> pulls off the rightmost
- five characters that represent the <literal>MM-DD</literal>
- (calendar year) part of the date. The part of the expression
- that compares the <literal>MM-DD</literal> values evaluates to
- 1 or 0, which adjusts the year difference down a year if
+ date and <function role="sql">RIGHT()</function> pulls off the
+ rightmost five characters that represent the
+ <literal>MM-DD</literal> (calendar year) part of the date. The
+ part of the expression that compares the
+ <literal>MM-DD</literal> values evaluates to 1 or 0, which
+ adjusts the year difference down a year if
<literal>CURDATE()</literal> occurs earlier in the year than
<literal>birth</literal>. The full expression is somewhat
ungainly, so an <emphasis>alias</emphasis>
@@ -1916,9 +1917,10 @@
<literal>1</literal> and <literal>12</literal>. And
<literal>MOD(something,12)</literal> returns a number between
<literal>0</literal> and <literal>11</literal>. So the
- addition has to be after the <literal>MOD()</literal>,
- otherwise we would go from November (<literal>11</literal>) to
- January (<literal>1</literal>).
+ addition has to be after the
+ <function role="sql">MOD()</function>, otherwise we would go
+ from November (<literal>11</literal>) to January
+ (<literal>1</literal>).
</para>
</section>
@@ -2819,7 +2821,7 @@
You have previously seen <literal>SHOW DATABASES</literal>, which
lists the databases managed by the server. To find out which
database is currently selected, use the
- <literal>DATABASE()</literal> function:
+ <function role="sql">DATABASE()</function> function:
</para>
<programlisting>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-12-04 03:05:20 UTC (rev 9086)
+++ trunk/refman-5.0/data-types.xml 2007-12-04 03:31:54 UTC (rev 9087)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 713 bytes
@@ -2687,8 +2687,8 @@
MySQL 5.0.42, a <literal>DATE</literal> value is coerced to the
<literal>DATETIME</literal> type by adding the time portion as
<literal>'00:00:00'</literal>. To mimic the old behavior, use the
- <literal>CAST()</literal> function to perform the comparison in
- the following way:
+ <function role="sql">CAST()</function> function to perform the
+ comparison in the following way:
</para>
<programlisting>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 106 bytes
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9087 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 4 Dec |
