Author: paul
Date: 2007-12-05 03:45:23 +0100 (Wed, 05 Dec 2007)
New Revision: 9115
Log:
r27759@frost: paul | 2007-12-04 20:45:04 -0600
Reformat.
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/installing.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/news-4.1-core.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/errors-problems.xml
trunk/refman-5.0/faqs.xml
trunk/refman-5.0/installing-cs-core.xml
trunk/refman-5.0/language-structure-core.xml
trunk/refman-5.0/precision-math.xml
trunk/refman-5.0/replication-notes.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/errors-problems-core.xml
trunk/refman-5.1/faqs.xml
trunk/refman-5.1/installing-core.xml
trunk/refman-5.1/language-structure-core.xml
trunk/refman-5.1/partitioning-guide.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/precision-math.xml
trunk/refman-5.1/replication-configuration.xml
trunk/refman-5.1/replication-notes.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/stored-procedures.xml
trunk/refman-5.1/tutorial.xml
trunk/refman-6.0/client-utility-programs.xml
trunk/refman-6.0/data-types.xml
trunk/refman-6.0/dba-core.xml
trunk/refman-6.0/errors-problems.xml
trunk/refman-6.0/faqs.xml
trunk/refman-6.0/language-structure-core.xml
trunk/refman-6.0/partitioning-guide.xml
trunk/refman-6.0/partitioning.xml
trunk/refman-6.0/precision-math.xml
trunk/refman-6.0/replication-configuration.xml
trunk/refman-6.0/replication-notes.xml
trunk/refman-6.0/sql-syntax.xml
trunk/refman-6.0/stored-procedures.xml
trunk/refman-6.0/tutorial.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:27756
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:27759
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-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/data-types.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 6, Lines Added: 24, Lines Deleted: 19; 5069 bytes
@@ -2067,10 +2067,11 @@
for a column. With one exception, the default value must be a
constant; it cannot be a function or an expression. This means,
for example, that you cannot set the default for a date column
- to be the value of a function such as <function role="sql">NOW()</function>
- or <literal>CURRENT_DATE</literal>. The exception is that you
- can specify <literal>CURRENT_TIMESTAMP</literal> as the default
- for a <literal>TIMESTAMP</literal> column as of MySQL 4.1.2. See
+ to be the value of a function such as
+ <function role="sql">NOW()</function> or
+ <literal>CURRENT_DATE</literal>. The exception is that you can
+ specify <literal>CURRENT_TIMESTAMP</literal> as the default for
+ a <literal>TIMESTAMP</literal> column as of MySQL 4.1.2. See
<xref linkend="timestamp"/>.
</para>
@@ -3167,7 +3168,8 @@
A <literal>TIMESTAMP</literal> column other than the first
also can be assigned the current date and time by setting it
to <literal>NULL</literal> or to any function that produces
- the current date and time (<function role="sql">NOW()</function>,
+ the current date and time
+ (<function role="sql">NOW()</function>,
<literal>CURRENT_TIMESTAMP</literal>).
</para>
@@ -3219,8 +3221,8 @@
<para>
Another way to maintain a column that records row-creation
time is to use a <literal>DATETIME</literal> column that you
- initialize to <function role="sql">NOW()</function> when the row is created
- and do not modify for subsequent updates.
+ initialize to <function role="sql">NOW()</function> when the
+ row is created and do not modify for subsequent updates.
</para>
<para>
@@ -3364,13 +3366,15 @@
on the underlying stored value is
<literal>UNIX_TIMESTAMP()</literal>. Other functions
operate on the formatted retrieved value. This means you
- cannot use a function such as <function role="sql">HOUR()</function> or
- <function role="sql">SECOND()</function> unless the relevant part of
- the <literal>TIMESTAMP</literal> value is included in the
- formatted value. For example, the <literal>HH</literal>
- part of a <literal>TIMESTAMP</literal> column is not
- displayed unless the display size is at least 10, so
- trying to use <function role="sql">HOUR()</function> on shorter
+ cannot use a function such as
+ <function role="sql">HOUR()</function> or
+ <function role="sql">SECOND()</function> unless the
+ relevant part of the <literal>TIMESTAMP</literal> value is
+ included in the formatted value. For example, the
+ <literal>HH</literal> part of a
+ <literal>TIMESTAMP</literal> column is not displayed
+ unless the display size is at least 10, so trying to use
+ <function role="sql">HOUR()</function> on shorter
<literal>TIMESTAMP</literal> values produces a meaningless
result.
</para>
@@ -3722,11 +3726,12 @@
<para>
<literal>CURRENT_TIMESTAMP</literal> or any of its
synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
- <function role="sql">NOW()</function>, <literal>LOCALTIME</literal>,
+ <function role="sql">NOW()</function>,
+ <literal>LOCALTIME</literal>,
<function role="sql">LOCALTIME()</function>,
<literal>LOCALTIMESTAMP</literal>, or
- <function role="sql">LOCALTIMESTAMP()</function>) can be used in the
- <literal>DEFAULT</literal> and <literal>ON
+ <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
not allowed. Its range of values does not align with those
@@ -4903,8 +4908,8 @@
you want more than <literal>max_sort_length</literal> bytes
to be significant is to convert the column value into a
fixed-length object. The standard way to do this is with the
- <function role="sql">SUBSTRING()</function> function. For example, the
- following statement causes 2000 bytes of the
+ <function role="sql">SUBSTRING()</function> function. For
+ example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
for sorting:
</para>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/dba-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 1389 bytes
@@ -4682,13 +4682,13 @@
abbreviations. This variable affects the output from the
<literal>DATE_FORMAT()</literal>,
<function role="sql">DAYNAME()</function> and
- <function role="sql">MONTHNAME()</function> functions. Locale names are
- POSIX-style values such as <literal>'ja_JP'</literal> or
- <literal>'pt_BR'</literal>. The default value is
- <literal>'en_US'</literal> regardless of your system's
- locale setting. For further information, see
- <xref linkend="locale-support"/>. This variable was added
- in MySQL 4.1.21.
+ <function role="sql">MONTHNAME()</function> functions.
+ Locale names are POSIX-style values such as
+ <literal>'ja_JP'</literal> or <literal>'pt_BR'</literal>.
+ The default value is <literal>'en_US'</literal> regardless
+ of your system's locale setting. For further information,
+ see <xref linkend="locale-support"/>. This variable was
+ added in MySQL 4.1.21.
</para>
</listitem>
Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/errors-problems.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 5, Lines Added: 19, Lines Deleted: 18; 3793 bytes
@@ -3898,8 +3898,8 @@
</programlisting>
<para>
- <function role="sql">STRCMP()</function> is a string function, so it
- converts <literal>idate</literal> to a string in
+ <function role="sql">STRCMP()</function> is a string function,
+ so it converts <literal>idate</literal> to a string in
<literal>'YYYY-MM-DD'</literal> format and performs a string
comparison. It does not convert <literal>'20030505'</literal>
to the date <literal>'2003-05-05'</literal> and perform a date
@@ -4495,8 +4495,8 @@
<para>
The problem cannot be solved by using
- <function role="sql">ROUND()</function> or similar functions, because the
- result is still a floating-point number:
+ <function role="sql">ROUND()</function> or similar functions,
+ because the result is still a floating-point number:
</para>
<programlisting>
@@ -5111,9 +5111,9 @@
<para>
Fixed in MySQL 4.1.10: Using <literal>HAVING</literal>,
you can get a crash or wrong result if you use an alias to
- a <function role="sql">RAND()</function> function. This will not be
- fixed in 4.0 because the fix may break compatability with
- some applications.
+ a <function role="sql">RAND()</function> function. This
+ will not be fixed in 4.0 because the fix may break
+ compatability with some applications.
</para>
</listitem>
@@ -5163,10 +5163,10 @@
<listitem>
<para>
- When using the <function role="sql">RPAD()</function> function (or any
- function adding spaces to the right) in a query that had
- to be resolved by using a temporary table, all resulting
- strings had rightmost spaces removed (i.e.
+ When using the <function role="sql">RPAD()</function>
+ function (or any function adding spaces to the right) in a
+ query that had to be resolved by using a temporary table,
+ all resulting strings had rightmost spaces removed (i.e.
<function role="sql">RPAD()</function> did not work).
</para>
</listitem>
@@ -5593,13 +5593,14 @@
depends on the function. The general rule is that bit
functions are performed with <literal>BIGINT</literal>
precision, <literal>IF</literal> and
- <function role="sql">ELT()</function> with <literal>BIGINT</literal> or
- <literal>DOUBLE</literal> precision, and the rest with
- <literal>DOUBLE</literal> precision. You should try to
- avoid using unsigned long long values if they resolve to
- be larger than 63 bits (9223372036854775807) for anything
- other than bit fields. MySQL Server 4.0 has better
- <literal>BIGINT</literal> handling than 3.23.
+ <function role="sql">ELT()</function> with
+ <literal>BIGINT</literal> or <literal>DOUBLE</literal>
+ precision, and the rest with <literal>DOUBLE</literal>
+ precision. You should try to avoid using unsigned long
+ long values if they resolve to be larger than 63 bits
+ (9223372036854775807) for anything other than bit fields.
+ MySQL Server 4.0 has better <literal>BIGINT</literal>
+ handling than 3.23.
</para>
</listitem>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/installing.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 8; 1833 bytes
@@ -13934,18 +13934,19 @@
<listitem>
<para>
- <function role="sql">LOCATE()</function> and <function role="sql">INSTR()</function>
- are case sensitive if one of the arguments is a binary
- string. Otherwise they are case insensitive.
+ <function role="sql">LOCATE()</function> and
+ <function role="sql">INSTR()</function> are case sensitive
+ if one of the arguments is a binary string. Otherwise they
+ are case insensitive.
</para>
</listitem>
<listitem>
<para>
- <function role="sql">STRCMP()</function> uses the current character set
- when performing comparisons. This makes the default
- comparison behavior not case sensitive unless one or both of
- the operands are binary strings.
+ <function role="sql">STRCMP()</function> uses the current
+ character set when performing comparisons. This makes the
+ default comparison behavior not case sensitive unless one or
+ both of the operands are binary strings.
</para>
</listitem>
@@ -13955,7 +13956,8 @@
returns the characters in <replaceable>str</replaceable>
converted to hexadecimal. If you want to convert a number to
hexadecimal, you should ensure that you call
- <function role="sql">HEX()</function> with a numeric argument.
+ <function role="sql">HEX()</function> with a numeric
+ argument.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.19.xml
===================================================================
--- trunk/refman-4.1/news-3.19.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-3.19.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 785 bytes
@@ -128,8 +128,10 @@
<listitem>
<para>
Added functions <function role="sql">CEILING()</function>,
- <function role="sql">ROUND()</function>, <function role="sql">EXP()</function>,
- <function role="sql">LOG()</function> and <function role="sql">SQRT()</function>.
+ <function role="sql">ROUND()</function>,
+ <function role="sql">EXP()</function>,
+ <function role="sql">LOG()</function> and
+ <function role="sql">SQRT()</function>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.20.xml
===================================================================
--- trunk/refman-4.1/news-3.20.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-3.20.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 8; 2101 bytes
@@ -173,11 +173,11 @@
<listitem>
<para>
- The <function role="sql">ELT()</function> function is renamed to
- <function role="sql">FIELD()</function>. The new <function role="sql">ELT()</function>
- function returns a value based on an index:
- <function role="sql">FIELD()</function> is the inverse of
- <function role="sql">ELT()</function> Example:
+ The <function role="sql">ELT()</function> function is renamed
+ to <function role="sql">FIELD()</function>. The new
+ <function role="sql">ELT()</function> function returns a value
+ based on an index: <function role="sql">FIELD()</function> is
+ the inverse of <function role="sql">ELT()</function> Example:
<literal>ELT(2,"A","B","C")</literal> returns
<literal>"B"</literal>.
<literal>FIELD("B","A","B","C")</literal> returns
@@ -1132,8 +1132,10 @@
<listitem>
<para>
New math functions: <function role="sql">EXP()</function>,
- <function role="sql">LOG()</function>, <function role="sql">SQRT()</function>,
- <function role="sql">ROUND()</function>, <function role="sql">CEILING()</function>.
+ <function role="sql">LOG()</function>,
+ <function role="sql">SQRT()</function>,
+ <function role="sql">ROUND()</function>,
+ <function role="sql">CEILING()</function>.
</para>
</listitem>
@@ -1327,7 +1329,8 @@
<listitem>
<para>
New functions: <function role="sql">INSERT()</function>,
- <function role="sql">RTRIM()</function>, <function role="sql">LTRIM()</function> and
+ <function role="sql">RTRIM()</function>,
+ <function role="sql">LTRIM()</function> and
<function role="sql">FORMAT()</function>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.21.xml
===================================================================
--- trunk/refman-4.1/news-3.21.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-3.21.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 5, Lines Added: 20, Lines Deleted: 12; 2942 bytes
@@ -717,8 +717,8 @@
<listitem>
<para>
- Added ODBC functions <function role="sql">DAYNAME()</function> and
- <function role="sql">MONTHNAME()</function>.
+ Added ODBC functions <function role="sql">DAYNAME()</function>
+ and <function role="sql">MONTHNAME()</function>.
</para>
</listitem>
@@ -844,10 +844,14 @@
<listitem>
<para>
Added functions <function role="sql">DAYOFYEAR()</function>,
- <function role="sql">DAYOFMONTH()</function>, <function role="sql">MONTH()</function>,
- <function role="sql">YEAR()</function>, <function role="sql">WEEK()</function>,
- <function role="sql">QUARTER()</function>, <function role="sql">HOUR()</function>,
- <function role="sql">MINUTE()</function>, <function role="sql">SECOND()</function> and
+ <function role="sql">DAYOFMONTH()</function>,
+ <function role="sql">MONTH()</function>,
+ <function role="sql">YEAR()</function>,
+ <function role="sql">WEEK()</function>,
+ <function role="sql">QUARTER()</function>,
+ <function role="sql">HOUR()</function>,
+ <function role="sql">MINUTE()</function>,
+ <function role="sql">SECOND()</function> and
<literal>FIND_IN_SET()</literal>.
</para>
</listitem>
@@ -1036,7 +1040,8 @@
<listitem>
<para>
- Added function <function role="sql">REVERSE()</function> (by Zeev Suraski).
+ Added function <function role="sql">REVERSE()</function> (by
+ Zeev Suraski).
</para>
</listitem>
@@ -1403,8 +1408,8 @@
<secondary>with ODBC</secondary>
</indexterm>
- New function <function role="sql">DAYOFWEEK()</function> compatible with
- ODBC.
+ New function <function role="sql">DAYOFWEEK()</function>
+ compatible with ODBC.
</para>
</listitem>
@@ -2023,9 +2028,12 @@
<listitem>
<para>
Added handling of trigometric functions:
- <function role="sql">PI()</function>, <function role="sql">ACOS()</function>,
- <function role="sql">ASIN()</function>, <function role="sql">ATAN()</function>,
- <function role="sql">COS()</function>, <function role="sql">SIN()</function> and
+ <function role="sql">PI()</function>,
+ <function role="sql">ACOS()</function>,
+ <function role="sql">ASIN()</function>,
+ <function role="sql">ATAN()</function>,
+ <function role="sql">COS()</function>,
+ <function role="sql">SIN()</function> and
<function role="sql">TAN()</function>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-3.22.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 14; 2613 bytes
@@ -1062,9 +1062,10 @@
<listitem>
<para>
- Saving <function role="sql">NOW()</function>, <function role="sql">CURDATE()</function>
- or <function role="sql">CURTIME()</function> directly in a column didn't
- work.
+ Saving <function role="sql">NOW()</function>,
+ <function role="sql">CURDATE()</function> or
+ <function role="sql">CURTIME()</function> directly in a column
+ didn't work.
</para>
</listitem>
@@ -2055,8 +2056,8 @@
<listitem>
<para>
<emphasis role="bold">Warning: Incompatible change!</emphasis>
- <function role="sql">DAYOFWEEK()</function> had offset 0 for Sunday.
- Changed the offset to 1.
+ <function role="sql">DAYOFWEEK()</function> had offset 0 for
+ Sunday. Changed the offset to 1.
</para>
</listitem>
@@ -2155,16 +2156,17 @@
<listitem>
<para>
New functions <function role="sql">BIN()</function>,
- <function role="sql">OCT()</function>, <function role="sql">HEX()</function> and
- <function role="sql">CONV()</function> for converting between different
- number bases.
+ <function role="sql">OCT()</function>,
+ <function role="sql">HEX()</function> and
+ <function role="sql">CONV()</function> for converting between
+ different number bases.
</para>
</listitem>
<listitem>
<para>
- Added function <function role="sql">SUBSTRING()</function> with two
- arguments.
+ Added function <function role="sql">SUBSTRING()</function>
+ with two arguments.
</para>
</listitem>
@@ -2435,10 +2437,11 @@
<listitem>
<para>
- <function role="sql">WEEK()</function> now takes an optional argument to
- allow handling of weeks when the week starts on Monday (some
- European countries). By default, <function role="sql">WEEK()</function>
- assumes the week starts on Sunday.
+ <function role="sql">WEEK()</function> now takes an optional
+ argument to allow handling of weeks when the week starts on
+ Monday (some European countries). By default,
+ <function role="sql">WEEK()</function> assumes the week starts
+ on Sunday.
</para>
</listitem>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-3.23.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 14, Lines Added: 33, Lines Deleted: 29; 5586 bytes
@@ -125,8 +125,8 @@
<para>
Fixed bugs in <function role="sql">ACOS()</function>,
<function role="sql">ASIN()</function> (Bug #2338) and in
- <function role="sql">FLOOR()</function> (Bug #3051). The cause of the
- problem is an overly strong optimization done by
+ <function role="sql">FLOOR()</function> (Bug #3051). The cause
+ of the problem is an overly strong optimization done by
<command>gcc</command> in this case.
</para>
</listitem>
@@ -608,8 +608,8 @@
<listitem>
<para>
- Better <function role="sql">RAND()</function> initialization for new
- connections.
+ Better <function role="sql">RAND()</function> initialization
+ for new connections.
</para>
</listitem>
@@ -1133,8 +1133,9 @@
<listitem>
<para>
- Changed initialization of <function role="sql">RAND()</function> to make it
- less predicatable.
+ Changed initialization of
+ <function role="sql">RAND()</function> to make it less
+ predicatable.
</para>
</listitem>
@@ -1353,8 +1354,8 @@
<listitem>
<para>
- Fixed the result from <function role="sql">IF()</function> is case
- in-sensitive if the second and third arguments are case
+ Fixed the result from <function role="sql">IF()</function> is
+ case in-sensitive if the second and third arguments are case
sensitive.
</para>
</listitem>
@@ -2869,8 +2870,8 @@
<listitem>
<para>
- Fixed problem with <function role="sql">IF()</function> and number of
- decimals in the result.
+ Fixed problem with <function role="sql">IF()</function> and
+ number of decimals in the result.
</para>
</listitem>
@@ -2931,8 +2932,8 @@
<listitem>
<para>
- Fixed a bug in <function role="sql">REPLACE()</function> when using the
- <literal>ujis</literal> character set.
+ Fixed a bug in <function role="sql">REPLACE()</function> when
+ using the <literal>ujis</literal> character set.
</para>
</listitem>
@@ -3572,9 +3573,9 @@
<para>
Fixed that <command>mysqlbinlog</command> writes the timestamp
value for each query. This ensures that one gets same values
- for date functions like <function role="sql">NOW()</function> when using
- <command>mysqlbinlog</command> to pipe the queries to another
- server.
+ for date functions like <function role="sql">NOW()</function>
+ when using <command>mysqlbinlog</command> to pipe the queries
+ to another server.
</para>
</listitem>
@@ -4300,9 +4301,9 @@
<listitem>
<para>
- <function role="sql">LPAD()</function> and <function role="sql">RPAD()</function>
- shortens the result string if it's longer than the length
- argument.
+ <function role="sql">LPAD()</function> and
+ <function role="sql">RPAD()</function> shortens the result
+ string if it's longer than the length argument.
</para>
</listitem>
@@ -5020,7 +5021,8 @@
<listitem>
<para>
Fixed a problem with <literal>SUBSTRING_INDEX()</literal> and
- <function role="sql">REPLACE()</function>. (Patch by Alexander Igonitchev)
+ <function role="sql">REPLACE()</function>. (Patch by Alexander
+ Igonitchev)
</para>
</listitem>
@@ -6099,8 +6101,8 @@
<listitem>
<para>
- Fixed <function role="sql">NULLIF()</function> to work as required by
- standard SQL.
+ Fixed <function role="sql">NULLIF()</function> to work as
+ required by standard SQL.
</para>
</listitem>
@@ -6519,9 +6521,9 @@
<listitem>
<para>
- The default type of <function role="sql">IF()</function> now depends on the
- second and third arguments and not only on the second
- argument.
+ The default type of <function role="sql">IF()</function> now
+ depends on the second and third arguments and not only on the
+ second argument.
</para>
</listitem>
@@ -7392,8 +7394,8 @@
<listitem>
<para>
- Added function <function role="sql">YEARWEEK()</function> and options
- <literal>x</literal>, <literal>X</literal>,
+ Added function <function role="sql">YEARWEEK()</function> and
+ options <literal>x</literal>, <literal>X</literal>,
<literal>v</literal> and <literal>V</literal> to
<literal>DATE_FORMAT()</literal>.
</para>
@@ -7576,8 +7578,9 @@
<listitem>
<para>
- Fixed bugs on Alpha with <function role="sql">REPLACE()</function> and
- <literal>LOAD DATA INFILE</literal>.
+ Fixed bugs on Alpha with
+ <function role="sql">REPLACE()</function> and <literal>LOAD
+ DATA INFILE</literal>.
</para>
</listitem>
@@ -7650,7 +7653,8 @@
<listitem>
<para>
- Made <function role="sql">FLOOR()</function> overflow safe on FreeBSD.
+ Made <function role="sql">FLOOR()</function> overflow safe on
+ FreeBSD.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-4.0.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 13, Lines Added: 46, Lines Deleted: 40; 7122 bytes
@@ -1141,8 +1141,9 @@
<listitem>
<para>
- Corrected a problem with the <function role="sql">QUOTE()</function>
- function returning bad results. (Bug #8248)
+ Corrected a problem with the
+ <function role="sql">QUOTE()</function> function returning bad
+ results. (Bug #8248)
</para>
</listitem>
@@ -1944,19 +1945,19 @@
<listitem>
<para>
- Fixed a bug in the function <function role="sql">ROUND()</function>
- reporting incorrect metadata (number of digits after the
- decimal point). It can be seen, for example, in
- <literal>CREATE TABLE t1 SELECT ROUND(1, 34)</literal>. (Bug
- #4393)
+ Fixed a bug in the function
+ <function role="sql">ROUND()</function> reporting incorrect
+ metadata (number of digits after the decimal point). It can be
+ seen, for example, in <literal>CREATE TABLE t1 SELECT ROUND(1,
+ 34)</literal>. (Bug #4393)
</para>
</listitem>
<listitem>
<para>
Fixed precision loss bug in some mathematical functions such
- as <function role="sql">SQRT()</function> and <function role="sql">LOG()</function>.
- (Bug #4356)
+ as <function role="sql">SQRT()</function> and
+ <function role="sql">LOG()</function>. (Bug #4356)
</para>
</listitem>
@@ -2004,9 +2005,9 @@
<listitem>
<para>
- Fixed a bug in <function role="sql">IF()</function> function incorrectly
- determining the result type if aggregate functions were
- involved. (Bug #3987)
+ Fixed a bug in <function role="sql">IF()</function> function
+ incorrectly determining the result type if aggregate functions
+ were involved. (Bug #3987)
</para>
</listitem>
@@ -3628,8 +3629,8 @@
<para>
Fixed an incorrect result from a query that uses only
<literal>const</literal> tables (such as one-row tables) and
- non-constant expression (such as <function role="sql">RAND()</function>).
- (Bug #1271)
+ non-constant expression (such as
+ <function role="sql">RAND()</function>). (Bug #1271)
</para>
</listitem>
@@ -6169,11 +6170,12 @@
<listitem>
<para>
- <function role="sql">RAND()</function> entries were not read correctly by
- <command>mysqlbinlog</command> from the binary log which
- caused problems when restoring a table that was inserted with
- <function role="sql">RAND()</function>. <literal>INSERT INTO t1
- VALUES(RAND())</literal>. In replication this worked okay.
+ <function role="sql">RAND()</function> entries were not read
+ correctly by <command>mysqlbinlog</command> from the binary
+ log which caused problems when restoring a table that was
+ inserted with <function role="sql">RAND()</function>.
+ <literal>INSERT INTO t1 VALUES(RAND())</literal>. In
+ replication this worked okay.
</para>
</listitem>
@@ -6860,7 +6862,8 @@
<listitem>
<para>
- Fixed core dump bug in <function role="sql">QUOTE()</function> function.
+ Fixed core dump bug in <function role="sql">QUOTE()</function>
+ function.
</para>
</listitem>
@@ -7263,9 +7266,10 @@
<listitem>
<para>
- Changed handling of last argument in <function role="sql">WEEK()</function>
- so that you can get week number according to the ISO 8601
- specification. (Old code should still work).
+ Changed handling of last argument in
+ <function role="sql">WEEK()</function> so that you can get
+ week number according to the ISO 8601 specification. (Old code
+ should still work).
</para>
</listitem>
@@ -8053,9 +8057,9 @@
<listitem>
<para>
- Added <function role="sql">QUOTE()</function> function that performs SQL
- quoting to produce values that can be used as data values in
- queries.
+ Added <function role="sql">QUOTE()</function> function that
+ performs SQL quoting to produce values that can be used as
+ data values in queries.
</para>
</listitem>
@@ -8316,8 +8320,8 @@
<listitem>
<para>
- Extended <function role="sql">LOG()</function> function to accept an
- optional arbitrary base parameter. See
+ Extended <function role="sql">LOG()</function> function to
+ accept an optional arbitrary base parameter. See
<xref linkend="mathematical-functions"/>.
</para>
</listitem>
@@ -8331,8 +8335,9 @@
<listitem>
<para>
- Added <function role="sql">LN()</function> natural logarithm function for
- compatibility with other databases. It is synonymous with
+ Added <function role="sql">LN()</function> natural logarithm
+ function for compatibility with other databases. It is
+ synonymous with
<literal>LOG(<replaceable>X</replaceable>)</literal>.
</para>
</listitem>
@@ -8356,8 +8361,8 @@
<listitem>
<para>
- Fixed <function role="sql">TRUNCATE()</function> to round up negative
- values to the nearest integer.
+ Fixed <function role="sql">TRUNCATE()</function> to round up
+ negative values to the nearest integer.
</para>
</listitem>
@@ -9252,16 +9257,17 @@
<listitem>
<para>
- <function role="sql">LOCATE()</function> and <function role="sql">INSTR()</function> are
- now case sensitive if either argument is a binary string.
+ <function role="sql">LOCATE()</function> and
+ <function role="sql">INSTR()</function> are now case sensitive
+ if either argument is a binary string.
</para>
</listitem>
<listitem>
<para>
- Changed <function role="sql">RAND()</function> initialization so that
- <literal>RAND(N)</literal> and <literal>RAND(N+1)</literal>
- are more distinct.
+ Changed <function role="sql">RAND()</function> initialization
+ so that <literal>RAND(N)</literal> and
+ <literal>RAND(N+1)</literal> are more distinct.
</para>
</listitem>
@@ -9402,9 +9408,9 @@
<listitem>
<para>
- <function role="sql">STRCMP()</function> now uses the current character set
- when doing comparisons, which means that the default
- comparison behavior now is case insensitive.
+ <function role="sql">STRCMP()</function> now uses the current
+ character set when doing comparisons, which means that the
+ default comparison behavior now is case insensitive.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.1-core.xml
===================================================================
--- trunk/refman-4.1/news-4.1-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/news-4.1-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 756 bytes
@@ -31,9 +31,9 @@
<listitem>
<para>
- The <function role="sql">SUBSTRING()</function> function can now take a
- negative value for the <replaceable>pos</replaceable> (position)
- argument. See <xref linkend="string-functions"/>.
+ The <function role="sql">SUBSTRING()</function> function can now
+ take a negative value for the <replaceable>pos</replaceable>
+ (position) argument. See <xref linkend="string-functions"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/replication.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 8; 1868 bytes
@@ -1592,9 +1592,9 @@
The same system time zone should be set for both master and
slave. Otherwise some statements will not be replicated
properly, such as statements that use the
- <function role="sql">NOW()</function> or <literal>FROM_UNIXTIME()</literal>
- functions. You can set the time zone in which MySQL server
- runs by using the
+ <function role="sql">NOW()</function> or
+ <literal>FROM_UNIXTIME()</literal> functions. You can set the
+ time zone in which MySQL server runs by using the
<option>--timezone=<replaceable>timezone_name</replaceable></option>
option of the <filename>mysqld_safe</filename> script or by
setting the <literal>TZ</literal> environment variable. Also
@@ -2085,12 +2085,13 @@
<listitem>
<para>
- In 3.23, <function role="sql">RAND()</function> in updates does not
- replicate properly. Use
+ In 3.23, <function role="sql">RAND()</function> in updates
+ does not replicate properly. Use
<literal>RAND(some_non_rand_expr)</literal> if you are
- replicating updates with <function role="sql">RAND()</function>. You can,
- for example, use <literal>UNIX_TIMESTAMP()</literal> as the
- argument to <function role="sql">RAND()</function>.
+ replicating updates with
+ <function role="sql">RAND()</function>. You can, for example,
+ use <literal>UNIX_TIMESTAMP()</literal> as the argument to
+ <function role="sql">RAND()</function>.
</para>
</listitem>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/sql-syntax.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1274 bytes
@@ -10336,9 +10336,9 @@
<listitem>
<para>
For help on a specific help topic, such as the
- <function role="sql">ASCII()</function> function or the <literal>CREATE
- TABLE</literal> statement, use the associated keyword or
- keywords:
+ <function role="sql">ASCII()</function> function or the
+ <literal>CREATE TABLE</literal> statement, use the
+ associated keyword or keywords:
</para>
<programlisting>
@@ -10560,9 +10560,9 @@
</itemizedlist>
<para>
- If you intend to use the <literal>HELP</literal> statement
- while other tables are locked with <literal>LOCK
- TABLES</literal>, you must also lock the required
+ If you intend to use the <literal>HELP</literal> statement while
+ other tables are locked with <literal>LOCK TABLES</literal>, you
+ must also lock the required
<literal>mysql.help_<replaceable>xxx</replaceable></literal>
tables.
</para>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-4.1/tutorial.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 13; 3233 bytes
@@ -1730,16 +1730,17 @@
</programlisting>
<para>
- Here, <function role="sql">YEAR()</function> pulls out the year part of a
- date and <function role="sql">RIGHT()</function> pulls off the
+ Here, <function role="sql">YEAR()</function> pulls out the
+ year part of a 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
- <function role="sql">CURDATE()</function> occurs earlier in the year than
- <literal>birth</literal>. The full expression is somewhat
- ungainly, so an <emphasis>alias</emphasis>
+ <function role="sql">CURDATE()</function> occurs earlier in
+ the year than <literal>birth</literal>. The full expression is
+ somewhat ungainly, so an <emphasis>alias</emphasis>
(<literal>age</literal>) is used to make the output column
label more meaningful.
</para>
@@ -1835,11 +1836,13 @@
irrelevant; you simply want to extract the month part of the
<literal>birth</literal> column. MySQL provides several
functions for extracting parts of dates, such as
- <function role="sql">YEAR()</function>, <function role="sql">MONTH()</function>, and
- <function role="sql">DAYOFMONTH()</function>. <function role="sql">MONTH()</function> is
- the appropriate function here. To see how it works, run a
- simple query that displays the value of both
- <literal>birth</literal> and <literal>MONTH(birth)</literal>:
+ <function role="sql">YEAR()</function>,
+ <function role="sql">MONTH()</function>, and
+ <function role="sql">DAYOFMONTH()</function>.
+ <function role="sql">MONTH()</function> is the appropriate
+ function here. To see how it works, run a simple query that
+ displays the value of both <literal>birth</literal> and
+ <literal>MONTH(birth)</literal>:
</para>
<programlisting>
@@ -1889,9 +1892,10 @@
current month is, so that you do not have to use the number
for a particular month. <literal>DATE_ADD()</literal> allows
you to add a time interval to a given date. If you add a month
- to the value of <function role="sql">CURDATE()</function>, then extract the
- month part with <function role="sql">MONTH()</function>, the result
- produces the month in which to look for birthdays:
+ to the value of <function role="sql">CURDATE()</function>,
+ then extract the month part with
+ <function role="sql">MONTH()</function>, the result produces
+ the month in which to look for birthdays:
</para>
<programlisting>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/client-utility-programs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 867 bytes
@@ -9152,8 +9152,8 @@
<entry><literal>0d</literal></entry>
<entry><literal>RAND_EVENT</literal></entry>
<entry>Used to send information about random values if the
- <function role="sql">RAND()</function> function is used in the
- statement.</entry>
+ <function role="sql">RAND()</function> function is
+ used in the statement.</entry>
</row>
<row>
<entry><literal>0e</literal></entry>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/data-types.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 9; 2692 bytes
@@ -2074,10 +2074,11 @@
for a column. With one exception, the default value must be a
constant; it cannot be a function or an expression. This means,
for example, that you cannot set the default for a date column
- to be the value of a function such as <function role="sql">NOW()</function>
- or <literal>CURRENT_DATE</literal>. The exception is that you
- can specify <literal>CURRENT_TIMESTAMP</literal> as the default
- for a <literal>TIMESTAMP</literal> column. See
+ to be the value of a function such as
+ <function role="sql">NOW()</function> or
+ <literal>CURRENT_DATE</literal>. The exception is that you can
+ specify <literal>CURRENT_TIMESTAMP</literal> as the default for
+ a <literal>TIMESTAMP</literal> column. See
<xref linkend="timestamp"/>.
</para>
@@ -3484,11 +3485,12 @@
<para>
<literal>CURRENT_TIMESTAMP</literal> or any of its
synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
- <function role="sql">NOW()</function>, <literal>LOCALTIME</literal>,
+ <function role="sql">NOW()</function>,
+ <literal>LOCALTIME</literal>,
<function role="sql">LOCALTIME()</function>,
<literal>LOCALTIMESTAMP</literal>, or
- <function role="sql">LOCALTIMESTAMP()</function>) can be used in the
- <literal>DEFAULT</literal> and <literal>ON
+ <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
not allowed. Its range of values does not align with those
@@ -4691,8 +4693,8 @@
you want more than <literal>max_sort_length</literal> bytes
to be significant is to convert the column value into a
fixed-length object. The standard way to do this is with the
- <function role="sql">SUBSTRING()</function> function. For example, the
- following statement causes 2000 bytes of the
+ <function role="sql">SUBSTRING()</function> function. For
+ example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
for sorting:
</para>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/dba-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 96, Lines Added: 112, Lines Deleted: 110; 25072 bytes
@@ -612,7 +612,7 @@
<option>--help</option>, <option>-?</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:help"/>
<para>
@@ -636,7 +636,7 @@
<option>--abort-slave-event-count</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:abort-slave-event-count"/>
<para>
@@ -659,7 +659,7 @@
<option>--allow-suspicious-udfs</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:allow-suspicious-udfs"/>
<para>
@@ -688,7 +688,7 @@
<option>--ansi</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:ansi"/>
<para>
@@ -715,7 +715,7 @@
<option>--basedir=<replaceable>path</replaceable></option>,
<option>-b <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:basedir"/>
<para>
@@ -728,7 +728,7 @@
<para id="option_mysqld_big-tables">
<option>big-tables</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:big-tables"/>
<para>
@@ -756,7 +756,7 @@
<option>--bind-address=<replaceable>IP</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:bind-address"/>
<para>
@@ -780,7 +780,7 @@
<option>--bootstrap</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:bootstrap"/>
<para>
@@ -811,7 +811,7 @@
<option>--character-sets-dir=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:character-sets-dir"/>
<para>
@@ -834,7 +834,7 @@
<option>--character-set-client-handshake</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:character-set-client-handshake"/>
<para>
@@ -860,7 +860,7 @@
<option>--character-set-filesystem=<replaceable>charset_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:character-set-filesystem"/>
<para>
@@ -886,7 +886,7 @@
<option>-C
<replaceable>charset_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:character-set-server"/>
<para>
@@ -913,7 +913,7 @@
<option>--chroot=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:chroot"/>
<para>
@@ -940,7 +940,7 @@
<option>--collation-server=<replaceable>collation_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:collation-server"/>
<para>
@@ -964,7 +964,7 @@
<option>--console</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:console"/>
<para>
@@ -990,7 +990,7 @@
<option>--core-file</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:core-file"/>
<para>
@@ -1019,7 +1019,7 @@
<option>--datadir=<replaceable>path</replaceable></option>,
<option>-h <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:datadir"/>
<para>
@@ -1043,7 +1043,7 @@
<option>-#
[<replaceable>debug_options</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:debug"/>
<para>
@@ -1084,7 +1084,7 @@
<option>--default-character-set=<replaceable>charset_name</replaceable></option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:default-character-set"/>
<para>
@@ -1109,7 +1109,7 @@
<option>--default-collation=<replaceable>collation_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:default-collation"/>
<para>
@@ -1134,7 +1134,7 @@
<option>--default-storage-engine=<replaceable>type</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:default-storage-engine"/>
<para>
@@ -1157,7 +1157,7 @@
<option>--default-table-type=<replaceable>type</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:default-table-type"/>
<para>
@@ -1180,7 +1180,7 @@
<option>--default-time-zone=<replaceable>timezone</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:default-time-zone"/>
<para>
@@ -1206,7 +1206,7 @@
<option>--delay-key-write[={OFF|ON|ALL}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:delay-key-write"/>
<para>
@@ -1247,7 +1247,7 @@
<option>--des-key-file=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:des-key-file"/>
<para>
@@ -1272,7 +1272,7 @@
<option>--disconnect-slave-event-count</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:disconnect-slave-event-count"/>
<para>
@@ -1295,7 +1295,7 @@
<option>--enable-named-pipe</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:enable-named-pipe"/>
<para>
@@ -1321,7 +1321,7 @@
<option>--exit-info[=<replaceable>flags</replaceable>]</option>,
<option>-T [<replaceable>flags</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:exit-info"/>
<para>
@@ -1355,7 +1355,7 @@
<option>--external-locking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:external-locking"/>
<para>
@@ -1388,7 +1388,7 @@
<option>--flush</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:flush"/>
<para>
@@ -1414,7 +1414,7 @@
<option>--enable-pstack</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:enable-pstack"/>
<para>
@@ -1436,7 +1436,7 @@
<option>--gdb</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:gdb"/>
<para>
@@ -1463,7 +1463,7 @@
<option>--init-file=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:init-file"/>
<para>
@@ -1507,7 +1507,7 @@
<para>
<option>--innodb-<replaceable>xxx</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:innodb"/>
<para>
@@ -1531,7 +1531,7 @@
<option>--language=<replaceable>lang_name</replaceable>,
-L <replaceable>lang_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:language"/>
<para>
@@ -1557,7 +1557,7 @@
<option>--large-pages</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:large-pages"/>
<para>
@@ -1605,7 +1605,7 @@
<option>--log[=<replaceable>file_name</replaceable>]</option>,
<option>-l [<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log"/>
<para>
@@ -1631,7 +1631,7 @@
<option>--log-bin[=<replaceable>base_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-bin"/>
<para>
@@ -1666,7 +1666,7 @@
<option>--log-bin-index[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-bin-index"/>
<para>
@@ -1693,7 +1693,7 @@
<option>--log-bin-trust-function-creators[={0|1}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-bin-trust-function-creators"/>
<para>
@@ -1758,7 +1758,7 @@
<option>--log-error[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-error"/>
<para>
@@ -1785,7 +1785,7 @@
<option>--log-isam[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-isam"/>
<para>
@@ -1809,7 +1809,7 @@
<option>--log-long-format</option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-long-format"/>
<para>
@@ -1839,7 +1839,7 @@
<option>--log-queries-not-using-indexes</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-queries-not-using-indexes"/>
<para>
@@ -1864,7 +1864,7 @@
<option>--log-short-format</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-short-format"/>
<para>
@@ -1889,7 +1889,7 @@
<option>--log-slow-admin-statements</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-slow-admin-statements"/>
<para>
@@ -1914,7 +1914,7 @@
<option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-slow-queries"/>
<para>
@@ -1940,7 +1940,7 @@
<option>--log-tc=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-tc"/>
<para>
@@ -1967,7 +1967,7 @@
<option>--log-tc-size=<replaceable>size</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-tc-size"/>
<para>
@@ -1992,7 +1992,7 @@
<option>--log-warnings[=<replaceable>level</replaceable>]</option>,
<option>-W [<replaceable>level</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:log-warnings"/>
<para>
@@ -2024,7 +2024,7 @@
<option>--low-priority-updates</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:low-priority-updates"/>
<para>
@@ -2057,7 +2057,7 @@
<option>--max-binlog-dump-events</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:max-binlog-dump-events"/>
<para>
@@ -2080,7 +2080,7 @@
<option>--memlock</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:memlock"/>
<para>
@@ -2110,7 +2110,7 @@
<option>--myisam-recover[=<replaceable>option</replaceable>[,<replaceable>option</replaceable>]...]]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:myisam-recover"/>
<para>
@@ -2198,7 +2198,7 @@
<option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:ndb-connectstring"/>
<para>
@@ -2224,7 +2224,7 @@
<option>--ndbcluster</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:ndbcluster"/>
<para>
@@ -2249,7 +2249,7 @@
<option>--old-passwords</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:old-passwords"/>
<para>
@@ -2274,7 +2274,7 @@
<option>--old-style-user-limits</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:old-style-user-limits"/>
<para>
@@ -2301,7 +2301,7 @@
<option>--one-thread</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:one-thread"/>
<para>
@@ -2327,7 +2327,7 @@
<option>--open-files-limit=<replaceable>count</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:open-files-limit"/>
<para>
@@ -2360,7 +2360,7 @@
<option>--pid-file=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:pid-file"/>
<para>
@@ -2385,7 +2385,7 @@
<option>--port=<replaceable>port_num</replaceable></option>,
<option>-P <replaceable>port_num</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:port"/>
<para>
@@ -2410,7 +2410,7 @@
<option>--port-open-timeout=<replaceable>num</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:port-open-timeout"/>
<para>
@@ -2438,7 +2438,7 @@
<option>--safe-mode</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:safe-mode"/>
<para>
@@ -2461,7 +2461,7 @@
<option>--safe-show-database</option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:safe-show-database"/>
<para>
@@ -2483,7 +2483,7 @@
<option>--safe-user-create</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:safe-user-create"/>
<para>
@@ -2523,7 +2523,7 @@
<option>--secure-auth</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:secure-auth"/>
<para>
@@ -2546,7 +2546,7 @@
<option>--secure-file-priv=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:secure-file-priv"/>
<para>
@@ -2576,7 +2576,7 @@
<option>--shared-memory</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:shared-memory"/>
<para>
@@ -2599,7 +2599,7 @@
<option>--shared-memory-base-name=<replaceable>name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:shared-memory-base-name"/>
<para>
@@ -2624,7 +2624,7 @@
<option>--skip-bdb</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-bdb"/>
<para>
@@ -2649,7 +2649,7 @@
<option>--skip-concurrent-insert</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-concurrent-insert"/>
<para>
@@ -2683,7 +2683,7 @@
<option>--skip-external-locking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-external-locking"/>
<para>
@@ -2713,7 +2713,7 @@
<option>--skip-grant-tables</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-grant-tables"/>
<para>
@@ -2751,7 +2751,7 @@
<option>--skip-host-cache</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-host-cache"/>
<para>
@@ -2775,7 +2775,7 @@
<option>--skip-innodb</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-innodb"/>
<para>
@@ -2800,7 +2800,7 @@
<option>--skip-merge</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skiip-merge"/>
<para>
@@ -2833,7 +2833,7 @@
<option>--skip-name-resolve</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-name-resolve"/>
<para>
@@ -2859,7 +2859,7 @@
<option>--skip-ndbcluster</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-ndbcluster"/>
<para>
@@ -2888,7 +2888,7 @@
<option>--skip-networking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-networking"/>
<para>
@@ -2915,7 +2915,7 @@
<option>--sporadic-binlog-dump-fail</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:sporadic-binlog-dump-fail"/>
<para>
@@ -2961,7 +2961,7 @@
<option>--standalone</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:standalone"/>
<para>
@@ -2994,7 +2994,7 @@
<option>--symbolic-links</option>,
<option>--skip-symbolic-links</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:symbolic-links"/>
<para>
@@ -3046,7 +3046,7 @@
<option>--skip-safemalloc</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-safemalloc"/>
<para>
@@ -3073,7 +3073,7 @@
<option>--skip-show-database</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-show-database"/>
<para>
@@ -3104,7 +3104,7 @@
<option>--skip-stack-trace</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-stack-trace"/>
<para>
@@ -3131,7 +3131,7 @@
<option>--skip-thread-priority</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:skip-thread-priority"/>
<para>
@@ -3186,7 +3186,7 @@
<option>--sql-mode=<replaceable>value</replaceable>[,<replaceable>value</replaceable>[,<replaceable>value</replaceable>...]]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:sql-mode"/>
<para>
@@ -3208,19 +3208,21 @@
<option>--sysdate-is-now</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:sysdate-is-now"/>
<para>
- As of MySQL 5.0.13, <function role="sql">SYSDATE()</function> by
- default returns the time at which it executes, not the
- time at which the statement in which it occurs begins
- executing. This differs from the behavior of
+ As of MySQL 5.0.13,
+ <function role="sql">SYSDATE()</function> by default
+ returns the time at which it executes, not the time at
+ which the statement in which it occurs begins executing.
+ This differs from the behavior of
<function role="sql">NOW()</function>. This option causes
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>. For information about the
- implications for binary logging and replication, see the
- description for <function role="sql">SYSDATE()</function> in
+ <function role="sql">SYSDATE()</function> to be an alias
+ for <function role="sql">NOW()</function>. For information
+ about the implications for binary logging and replication,
+ see the description for
+ <function role="sql">SYSDATE()</function> in
<xref linkend="date-and-time-functions"/> and for
<literal>SET TIMESTAMP</literal> in
<xref linkend="set-option"/>.
@@ -3245,7 +3247,7 @@
<option>--tc-heuristic-recover={COMMIT|ROLLBACK}</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:tc-heuristic-recover"/>
<para>
@@ -3269,7 +3271,7 @@
<option>--temp-pool</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:temp-pool"/>
<para>
@@ -3298,7 +3300,7 @@
<option>--transaction-isolation=<replaceable>level</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:transaction-isolation"/>
<para>
@@ -3327,7 +3329,7 @@
<option>--tmpdir=<replaceable>path</replaceable></option>,
<option>-t <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:tmpdir"/>
<para>
@@ -3370,7 +3372,7 @@
<option>-u
{<replaceable>user_name</replaceable>|<replaceable>user_id</replaceable>}</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:user"/>
<para>
@@ -3427,7 +3429,7 @@
<option>--version</option>, <option>-V</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.0:mysqld:version"/>
<para>
@@ -5429,13 +5431,13 @@
abbreviations. This variable affects the output from the
<literal>DATE_FORMAT()</literal>,
<function role="sql">DAYNAME()</function> and
- <function role="sql">MONTHNAME()</function> functions. Locale names are
- POSIX-style values such as <literal>'ja_JP'</literal> or
- <literal>'pt_BR'</literal>. The default value is
- <literal>'en_US'</literal> regardless of your system's
- locale setting. For further information, see
- <xref linkend="locale-support"/>. This variable was added
- in MySQL 5.0.25.
+ <function role="sql">MONTHNAME()</function> functions.
+ Locale names are POSIX-style values such as
+ <literal>'ja_JP'</literal> or <literal>'pt_BR'</literal>.
+ The default value is <literal>'en_US'</literal> regardless
+ of your system's locale setting. For further information,
+ see <xref linkend="locale-support"/>. This variable was
+ added in MySQL 5.0.25.
</para>
</listitem>
Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/errors-problems.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 10; 2261 bytes
@@ -3804,8 +3804,8 @@
</programlisting>
<para>
- <function role="sql">STRCMP()</function> is a string function, so it
- converts <literal>idate</literal> to a string in
+ <function role="sql">STRCMP()</function> is a string function,
+ so it converts <literal>idate</literal> to a string in
<literal>'YYYY-MM-DD'</literal> format and performs a string
comparison. It does not convert <literal>'20030505'</literal>
to the date <literal>'2003-05-05'</literal> and perform a date
@@ -4406,8 +4406,8 @@
<para>
The problem cannot be solved by using
- <function role="sql">ROUND()</function> or similar functions, because the
- result is still a floating-point number:
+ <function role="sql">ROUND()</function> or similar functions,
+ because the result is still a floating-point number:
</para>
<programlisting>
@@ -5315,12 +5315,12 @@
depends on the function. The general rule is that bit
functions are performed with <literal>BIGINT</literal>
precision, <literal>IF</literal> and
- <function role="sql">ELT()</function> with <literal>BIGINT</literal> or
- <literal>DOUBLE</literal> precision, and the rest with
- <literal>DOUBLE</literal> precision. You should try to
- avoid using unsigned long long values if they resolve to
- be larger than 63 bits (9223372036854775807) for anything
- other than bit fields.
+ <function role="sql">ELT()</function> with
+ <literal>BIGINT</literal> or <literal>DOUBLE</literal>
+ precision, and the rest with <literal>DOUBLE</literal>
+ precision. You should try to avoid using unsigned long
+ long values if they resolve to be larger than 63 bits
+ (9223372036854775807) for anything other than bit fields.
</para>
</listitem>
Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/faqs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 603 bytes
@@ -149,8 +149,9 @@
<question>
<para>
- Does MySQL ¤t-series; have a <function role="sql">NOW()</function>
- function with fractions of seconds?
+ Does MySQL ¤t-series; have a
+ <function role="sql">NOW()</function> function with
+ fractions of seconds?
</para>
</question>
Modified: trunk/refman-5.0/installing-cs-core.xml
===================================================================
--- trunk/refman-5.0/installing-cs-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/installing-cs-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 14; 3475 bytes
@@ -13521,9 +13521,9 @@
<listitem>
<para>
<emphasis role="bold">Incompatible change:</emphasis> As of
- MySQL 5.0.15, the <function role="sql">CHAR()</function> function returns
- a binary string rather than a string in the connection
- character set. An optional <literal>USING
+ MySQL 5.0.15, the <function role="sql">CHAR()</function>
+ function returns a binary string rather than a string in the
+ connection character set. An optional <literal>USING
<replaceable>charset_name</replaceable></literal> clause may
be used to produce a result in a specific character set
instead. Also, arguments larger than 256 produce multiple
@@ -13580,8 +13580,9 @@
<literal>VARCHAR</literal> column, use
<literal>USING</literal> or
<function role="sql">CONVERT()</function> as just
- described to convert the <function role="sql">CHAR()</function>
- result into a non-binary character set.
+ described to convert the
+ <function role="sql">CHAR()</function> result into a
+ non-binary character set.
</para>
</listitem>
@@ -13710,21 +13711,22 @@
<para>
<emphasis role="bold">Incompatible change:</emphasis> Before
MySQL 5.0.13, <function role="sql">NOW()</function> and
- <function role="sql">SYSDATE()</function> return the same value (the time
- at which the statement in which the function occurs begins
- executing). As of MySQL 5.0.13, <function role="sql">SYSDATE()</function>
- returns the time at which it executes, which can differ from
- the value returned by <function role="sql">NOW()</function>. For
+ <function role="sql">SYSDATE()</function> return the same
+ value (the time at which the statement in which the function
+ occurs begins executing). As of MySQL 5.0.13,
+ <function role="sql">SYSDATE()</function> returns the time
+ at which it executes, which can differ from the value
+ returned by <function role="sql">NOW()</function>. For
information about the implications for binary logging,
replication, and use of indexes, see the description for
<function role="sql">SYSDATE()</function> in
<xref linkend="date-and-time-functions"/> and for
<literal>SET TIMESTAMP</literal> in
<xref linkend="set-option"/>. To restore the former behavior
- for <function role="sql">SYSDATE()</function> and cause it to be an alias
- for <function role="sql">NOW()</function>, start the server with the
- <option>--sysdate-is-now</option> option (available as of
- MySQL 5.0.20).
+ for <function role="sql">SYSDATE()</function> and cause it
+ to be an alias for <function role="sql">NOW()</function>,
+ start the server with the <option>--sysdate-is-now</option>
+ option (available as of MySQL 5.0.20).
</para>
</listitem>
Modified: trunk/refman-5.0/language-structure-core.xml
===================================================================
--- trunk/refman-5.0/language-structure-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/language-structure-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1245 bytes
@@ -744,8 +744,8 @@
<para>
Bit values are returned as binary values. To display them in
printable form, add 0 or use a conversion function such as
- <function role="sql">BIN()</function>. High-order 0 bits are not displayed in
- the converted value.
+ <function role="sql">BIN()</function>. High-order 0 bits are not
+ displayed in the converted value.
</para>
<programlisting>
@@ -1704,8 +1704,9 @@
For example, if you create a stored function named
<literal>PI</literal> in the <literal>test</literal>
database, you invoke it as <literal>test.PI()</literal>
- because the server resolves <function role="sql">PI()</function> as a
- reference to the built-in function.
+ because the server resolves
+ <function role="sql">PI()</function> as a reference to the
+ built-in function.
</para>
</listitem>
Modified: trunk/refman-5.0/precision-math.xml
===================================================================
--- trunk/refman-5.0/precision-math.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/precision-math.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 4, Lines Added: 22, Lines Deleted: 19; 3746 bytes
@@ -109,9 +109,9 @@
<para>
<emphasis role="bold">Well-defined rounding behavior</emphasis>:
For exact-value numbers, the result of
- <function role="sql">ROUND()</function> depends on its argument, not on
- environmental factors such as how the underlying C library
- works.
+ <function role="sql">ROUND()</function> depends on its argument,
+ not on environmental factors such as how the underlying C
+ library works.
</para>
</listitem>
@@ -714,26 +714,29 @@
<para>
This section discusses precision math rounding for the
- <function role="sql">ROUND()</function> function and for inserts into columns
- with exact-value types (<literal>DECIMAL</literal> and integer).
+ <function role="sql">ROUND()</function> function and for inserts
+ into columns with exact-value types (<literal>DECIMAL</literal>
+ and integer).
</para>
<para>
- The <function role="sql">ROUND()</function> function rounds differently
- depending on whether its argument is exact or approximate:
+ The <function role="sql">ROUND()</function> function rounds
+ differently depending on whether its argument is exact or
+ approximate:
</para>
<itemizedlist>
<listitem>
<para>
- For exact-value numbers, <function role="sql">ROUND()</function> uses the
- <quote>round half up</quote> rule: A value with a fractional
- part of .5 or greater is rounded up to the next integer if
- positive or down to the next integer if negative. (In other
- words, it is rounded away from zero.) A value with a
- fractional part less than .5 is rounded down to the next
- integer if positive or up to the next integer if negative.
+ For exact-value numbers,
+ <function role="sql">ROUND()</function> uses the <quote>round
+ half up</quote> rule: A value with a fractional part of .5 or
+ greater is rounded up to the next integer if positive or down
+ to the next integer if negative. (In other words, it is
+ rounded away from zero.) A value with a fractional part less
+ than .5 is rounded down to the next integer if positive or up
+ to the next integer if negative.
</para>
</listitem>
@@ -741,9 +744,9 @@
<para>
For approximate-value numbers, the result depends on the C
library. On many systems, this means that
- <function role="sql">ROUND()</function> uses the <quote>round to nearest
- even</quote> rule: A value with any fractional part is rounded
- to the nearest even integer.
+ <function role="sql">ROUND()</function> uses the <quote>round
+ to nearest even</quote> rule: A value with any fractional part
+ is rounded to the nearest even integer.
</para>
</listitem>
@@ -938,8 +941,8 @@
<para>
Before MySQL 5.0.3, rounding behavior (for example, with the
- <function role="sql">ROUND()</function> function) is dependent on the
- implementation of the underlying C library. This results in
+ <function role="sql">ROUND()</function> function) is dependent on
+ the implementation of the underlying C library. This results in
inconsistencies from platform to platform. For example, you might
get a different value on Windows than on Linux, or a different
value on x86 machines than on PowerPC machines.
Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/replication-notes.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 4, Lines Added: 18, Lines Deleted: 16; 3557 bytes
@@ -48,9 +48,10 @@
example, you cannot replicate from MySQL ¤t-series; to
&previous-series;. However, these incompatibilities also can occur
for within-series replication. For example, the
- <function role="sql">SLEEP()</function> function is available in MySQL 5.0.12
- and up. If you use this function on the master server, you cannot
- replicate to a slave server that is older than MySQL 5.0.12.
+ <function role="sql">SLEEP()</function> function is available in
+ MySQL 5.0.12 and up. If you use this function on the master
+ server, you cannot replicate to a slave server that is older than
+ MySQL 5.0.12.
</para>
<para>
@@ -373,14 +374,15 @@
<listitem>
<para>
- As of MySQL 5.0.13, the <function role="sql">SYSDATE()</function>
- function is no longer equivalent to
- <function role="sql">NOW()</function>. Implications are that
- <function role="sql">SYSDATE()</function> is not replication-safe because
- it is not affected by <literal>SET TIMESTAMP</literal>
- statements in the binary log and is non-deterministic. To
- avoid this, you can start the server with the
- <option>--sysdate-is-now</option> option to cause
+ As of MySQL 5.0.13, the
+ <function role="sql">SYSDATE()</function> function is no
+ longer equivalent to <function role="sql">NOW()</function>.
+ Implications are that
+ <function role="sql">SYSDATE()</function> is not
+ replication-safe because it is not affected by <literal>SET
+ TIMESTAMP</literal> statements in the binary log and is
+ non-deterministic. To avoid this, you can start the server
+ with the <option>--sysdate-is-now</option> option to cause
<function role="sql">SYSDATE()</function> to be an alias for
<function role="sql">NOW()</function>.
</para>
@@ -460,8 +462,8 @@
<para>
Non-delayed <literal>INSERT</literal> statements that refer to
- <function role="sql">RAND()</function> or user-defined variables replicate
- correctly. However, changing the statements to use
+ <function role="sql">RAND()</function> or user-defined variables
+ replicate correctly. However, changing the statements to use
<literal>INSERT DELAYED</literal> can result in different
results on master and slave.
</para>
@@ -721,9 +723,9 @@
If the master uses MySQL 4.1, the same system time zone should
be set for both master and slave. Otherwise some statements will
not be replicated properly, such as statements that use the
- <function role="sql">NOW()</function> or <literal>FROM_UNIXTIME()</literal>
- functions. You can set the time zone in which MySQL server runs
- by using the
+ <function role="sql">NOW()</function> or
+ <literal>FROM_UNIXTIME()</literal> functions. You can set the
+ time zone in which MySQL server runs by using the
<option>--timezone=<replaceable>timezone_name</replaceable></option>
option of the <filename>mysqld_safe</filename> script or by
setting the <literal>TZ</literal> environment variable. Both
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/sql-syntax.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 12; 2454 bytes
@@ -11140,9 +11140,9 @@
<listitem>
<para>
For help on a specific help topic, such as the
- <function role="sql">ASCII()</function> function or the <literal>CREATE
- TABLE</literal> statement, use the associated keyword or
- keywords:
+ <function role="sql">ASCII()</function> function or the
+ <literal>CREATE TABLE</literal> statement, use the
+ associated keyword or keywords:
</para>
<programlisting>
@@ -11365,9 +11365,9 @@
</itemizedlist>
<para>
- If you intend to use the <literal>HELP</literal> statement
- while other tables are locked with <literal>LOCK
- TABLES</literal>, you must also lock the required
+ If you intend to use the <literal>HELP</literal> statement while
+ other tables are locked with <literal>LOCK TABLES</literal>, you
+ must also lock the required
<literal>mysql.help_<replaceable>xxx</replaceable></literal>
tables.
</para>
@@ -16884,13 +16884,14 @@
<para>
<literal>SET TIMESTAMP</literal> affects the value returned
by <function role="sql">NOW()</function> but not by
- <function role="sql">SYSDATE()</function>. This means that timestamp
- settings in the binary log have no effect on invocations of
- <function role="sql">SYSDATE()</function>. The server can be started with
- the <option>--sysdate-is-now</option> option to cause
+ <function role="sql">SYSDATE()</function>. This means that
+ timestamp settings in the binary log have no effect on
+ invocations of <function role="sql">SYSDATE()</function>.
+ The server can be started with the
+ <option>--sysdate-is-now</option> option to cause
<function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>, in which case <literal>SET
- TIMESTAMP</literal> affects both functions.
+ <function role="sql">NOW()</function>, in which case
+ <literal>SET TIMESTAMP</literal> affects both functions.
</para>
</listitem>
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/stored-procedures.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 27, Lines Deleted: 25; 4039 bytes
@@ -508,15 +508,16 @@
</para>
<para>
- A routine that contains the <function role="sql">NOW()</function> function
- (or its synonyms) or <function role="sql">RAND()</function> is
- non-deterministic, but it might still be replication-safe. For
- <function role="sql">NOW()</function>, the binary log includes the timestamp
- and replicates correctly. <function role="sql">RAND()</function> also
- replicates correctly as long as it is invoked only once within a
- routine. (You can consider the routine execution timestamp and
- random number seed as implicit inputs that are identical on the
- master and slave.)
+ A routine that contains the
+ <function role="sql">NOW()</function> function (or its synonyms)
+ or <function role="sql">RAND()</function> is non-deterministic,
+ but it might still be replication-safe. For
+ <function role="sql">NOW()</function>, the binary log includes
+ the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates correctly
+ as long as it is invoked only once within a routine. (You can
+ consider the routine execution timestamp and random number seed
+ as implicit inputs that are identical on the master and slave.)
</para>
<para>
@@ -2600,26 +2601,27 @@
</para>
<para>
- Use of the <function role="sql">NOW()</function> function (or its
- synonyms) or <function role="sql">RAND()</function> does not
+ Use of the <function role="sql">NOW()</function> function
+ (or its synonyms) or
+ <function role="sql">RAND()</function> does not
necessarily make a function non-deterministic. For
- <function role="sql">NOW()</function>, the binary log includes the
- timestamp and replicates correctly.
- <function role="sql">RAND()</function> also replicates correctly as
- long as it is invoked only once within a function. (You
- can consider the function execution timestamp and random
- number seed as implicit inputs that are identical on the
- master and slave.)
+ <function role="sql">NOW()</function>, the binary log
+ includes the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates
+ correctly as long as it is invoked only once within a
+ function. (You can consider the function execution
+ timestamp and random number seed as implicit inputs that
+ are identical on the master and slave.)
</para>
<para>
- <function role="sql">SYSDATE()</function> is not affected by the
- timestamps in the binary log, so it causes stored routines
- to be non-deterministic if statement-based logging is
- used. This does not occur if the server is started with
- the <option>--sysdate-is-now</option> option to cause
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>.
+ <function role="sql">SYSDATE()</function> is not affected
+ by the timestamps in the binary log, so it causes stored
+ routines to be non-deterministic if statement-based
+ logging is used. This does not occur if the server is
+ started with the <option>--sysdate-is-now</option> option
+ to cause <function role="sql">SYSDATE()</function> to be
+ an alias for <function role="sql">NOW()</function>.
</para>
</listitem>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.0/tutorial.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 13; 3233 bytes
@@ -1738,16 +1738,17 @@
</programlisting>
<para>
- Here, <function role="sql">YEAR()</function> pulls out the year part of a
- date and <function role="sql">RIGHT()</function> pulls off the
+ Here, <function role="sql">YEAR()</function> pulls out the
+ year part of a 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
- <function role="sql">CURDATE()</function> occurs earlier in the year than
- <literal>birth</literal>. The full expression is somewhat
- ungainly, so an <emphasis>alias</emphasis>
+ <function role="sql">CURDATE()</function> occurs earlier in
+ the year than <literal>birth</literal>. The full expression is
+ somewhat ungainly, so an <emphasis>alias</emphasis>
(<literal>age</literal>) is used to make the output column
label more meaningful.
</para>
@@ -1843,11 +1844,13 @@
irrelevant; you simply want to extract the month part of the
<literal>birth</literal> column. MySQL provides several
functions for extracting parts of dates, such as
- <function role="sql">YEAR()</function>, <function role="sql">MONTH()</function>, and
- <function role="sql">DAYOFMONTH()</function>. <function role="sql">MONTH()</function> is
- the appropriate function here. To see how it works, run a
- simple query that displays the value of both
- <literal>birth</literal> and <literal>MONTH(birth)</literal>:
+ <function role="sql">YEAR()</function>,
+ <function role="sql">MONTH()</function>, and
+ <function role="sql">DAYOFMONTH()</function>.
+ <function role="sql">MONTH()</function> is the appropriate
+ function here. To see how it works, run a simple query that
+ displays the value of both <literal>birth</literal> and
+ <literal>MONTH(birth)</literal>:
</para>
<programlisting>
@@ -1897,9 +1900,10 @@
current month is, so that you do not have to use the number
for a particular month. <literal>DATE_ADD()</literal> allows
you to add a time interval to a given date. If you add a month
- to the value of <function role="sql">CURDATE()</function>, then extract the
- month part with <function role="sql">MONTH()</function>, the result
- produces the month in which to look for birthdays:
+ to the value of <function role="sql">CURDATE()</function>,
+ then extract the month part with
+ <function role="sql">MONTH()</function>, the result produces
+ the month in which to look for birthdays:
</para>
<programlisting>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/client-utility-programs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 867 bytes
@@ -9397,8 +9397,8 @@
<entry><literal>0d</literal></entry>
<entry><literal>RAND_EVENT</literal></entry>
<entry>Used to send information about random values if the
- <function role="sql">RAND()</function> function is used in the
- statement.</entry>
+ <function role="sql">RAND()</function> function is
+ used in the statement.</entry>
</row>
<row>
<entry><literal>0e</literal></entry>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/data-types.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 9; 2692 bytes
@@ -1954,10 +1954,11 @@
for a column. With one exception, the default value must be a
constant; it cannot be a function or an expression. This means,
for example, that you cannot set the default for a date column
- to be the value of a function such as <function role="sql">NOW()</function>
- or <literal>CURRENT_DATE</literal>. The exception is that you
- can specify <literal>CURRENT_TIMESTAMP</literal> as the default
- for a <literal>TIMESTAMP</literal> column. See
+ to be the value of a function such as
+ <function role="sql">NOW()</function> or
+ <literal>CURRENT_DATE</literal>. The exception is that you can
+ specify <literal>CURRENT_TIMESTAMP</literal> as the default for
+ a <literal>TIMESTAMP</literal> column. See
<xref linkend="timestamp"/>.
</para>
@@ -3293,11 +3294,12 @@
<para>
<literal>CURRENT_TIMESTAMP</literal> or any of its
synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
- <function role="sql">NOW()</function>, <literal>LOCALTIME</literal>,
+ <function role="sql">NOW()</function>,
+ <literal>LOCALTIME</literal>,
<function role="sql">LOCALTIME()</function>,
<literal>LOCALTIMESTAMP</literal>, or
- <function role="sql">LOCALTIMESTAMP()</function>) can be used in the
- <literal>DEFAULT</literal> and <literal>ON
+ <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
not allowed. Its range of values does not align with those
@@ -4428,8 +4430,8 @@
you want more than <literal>max_sort_length</literal> bytes
to be significant is to convert the column value into a
fixed-length object. The standard way to do this is with the
- <function role="sql">SUBSTRING()</function> function. For example, the
- following statement causes 2000 bytes of the
+ <function role="sql">SUBSTRING()</function> function. For
+ example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
for sorting:
</para>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/dba-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 103, Lines Added: 120, Lines Deleted: 118; 27092 bytes
@@ -593,7 +593,7 @@
<option>--help</option>, <option>-?</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:help"/>
<para>
@@ -617,7 +617,7 @@
<option>--abort-slave-event-count</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:abort-slave-event-count"/>
<para>
@@ -640,7 +640,7 @@
<option>--allow-suspicious-udfs</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:allow-suspicious-udfs"/>
<para>
@@ -668,7 +668,7 @@
<option>--ansi</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:ansi"/>
<para>
@@ -695,7 +695,7 @@
<option>--basedir=<replaceable>path</replaceable></option>,
<option>-b <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:basedir"/>
<para>
@@ -708,7 +708,7 @@
<para id="option_mysqld_big-tables">
<option>big-tables</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:big-tables"/>
<para>
@@ -736,7 +736,7 @@
<option>--bind-address=<replaceable>IP</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:bind-address"/>
<para>
@@ -760,7 +760,7 @@
<option>--binlog-format={row|statement|mixed}</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:binlog-format"/>
<para>
@@ -785,7 +785,7 @@
<option>--binlog-row-event-max-size=<replaceable>N</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:binlog-row-event-max-size"/>
<para>
@@ -812,7 +812,7 @@
<option>--bootstrap</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:bootstrap"/>
<para>
@@ -843,7 +843,7 @@
<option>--character-sets-dir=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:character-sets-dir"/>
<para>
@@ -866,7 +866,7 @@
<option>--character-set-client-handshake</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:character-set-client-handshake"/>
<para>
@@ -892,7 +892,7 @@
<option>--character-set-filesystem=<replaceable>charset_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:character-set-filesystem"/>
<para>
@@ -918,7 +918,7 @@
<option>-C
<replaceable>charset_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:character-set-server"/>
<para>
@@ -945,7 +945,7 @@
<option>--chroot=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:chroot"/>
<para>
@@ -972,7 +972,7 @@
<option>--collation-server=<replaceable>collation_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:collation-server"/>
<para>
@@ -996,7 +996,7 @@
<option>--console</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:console"/>
<para>
@@ -1022,7 +1022,7 @@
<option>--core-file</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:core-file"/>
<para>
@@ -1051,7 +1051,7 @@
<option>--datadir=<replaceable>path</replaceable></option>,
<option>-h <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:datadir"/>
<para>
@@ -1075,7 +1075,7 @@
<option>-#
[<replaceable>debug_options</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:debug"/>
<para>
@@ -1116,7 +1116,7 @@
<option>--default-character-set=<replaceable>charset_name</replaceable></option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:default-character-set"/>
<para>
@@ -1141,7 +1141,7 @@
<option>--default-collation=<replaceable>collation_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:default-collation"/>
<para>
@@ -1166,7 +1166,7 @@
<option>--default-storage-engine=<replaceable>type</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:default-storage-engine"/>
<para>
@@ -1189,7 +1189,7 @@
<option>--default-table-type=<replaceable>type</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:default-table-type"/>
<para>
@@ -1212,7 +1212,7 @@
<option>--default-time-zone=<replaceable>timezone</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:default-time-zone"/>
<para>
@@ -1238,7 +1238,7 @@
<option>--delay-key-write[={OFF|ON|ALL}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:delay-key-write"/>
<para>
@@ -1279,7 +1279,7 @@
<option>--des-key-file=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:des-key-file"/>
<para>
@@ -1304,7 +1304,7 @@
<option>--disconnect-slave-event-count</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:disconnect-slave-event-count"/>
<para>
@@ -1327,7 +1327,7 @@
<option>--enable-named-pipe</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:enable-named-pipe"/>
<para>
@@ -1389,7 +1389,7 @@
<option>--exit-info[=<replaceable>flags</replaceable>]</option>,
<option>-T [<replaceable>flags</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:exit-info"/>
<para>
@@ -1423,7 +1423,7 @@
<option>--external-locking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:external-locking"/>
<para>
@@ -1456,7 +1456,7 @@
<option>--flush</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:flush"/>
<para>
@@ -1482,7 +1482,7 @@
<option>--general-log[={0|1}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:general-log"/>
<para>
@@ -1511,7 +1511,7 @@
<option>--enable-pstack</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:enable-pstack"/>
<para>
@@ -1533,7 +1533,7 @@
<option>--gdb</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:gdb"/>
<para>
@@ -1560,7 +1560,7 @@
<option>--init-file=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:init-file"/>
<para>
@@ -1580,7 +1580,7 @@
<para>
<option>--innodb-<replaceable>xxx</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:innodb"/>
<para>
@@ -1604,7 +1604,7 @@
<option>--language=<replaceable>lang_name</replaceable>,
-L <replaceable>lang_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:language"/>
<para>
@@ -1630,7 +1630,7 @@
<option>--large-pages</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:large-pages"/>
<para>
@@ -1677,7 +1677,7 @@
<option>--log[=<replaceable>file_name</replaceable>]</option>,
<option>-l [<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log"/>
<para>
@@ -1708,7 +1708,7 @@
<option>--log-bin[=<replaceable>base_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-bin"/>
<para>
@@ -1743,7 +1743,7 @@
<option>--log-bin-index[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-bin-index"/>
<para>
@@ -1770,7 +1770,7 @@
<option>--log-bin-trust-function-creators[={0|1}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-bin-trust-function-creators"/>
<para>
@@ -1798,7 +1798,7 @@
<option>--log-error[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-error"/>
<para>
@@ -1825,7 +1825,7 @@
<option>--log-isam[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-isam"/>
<para>
@@ -1849,7 +1849,7 @@
<option>--log-long-format</option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-long-format"/>
<para>
@@ -1879,7 +1879,7 @@
<option>--log-output[=<replaceable>value</replaceable>,...]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-output"/>
<para>
@@ -1931,7 +1931,7 @@
<option>--log-queries-not-using-indexes</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-queries-not-using-indexes"/>
<para>
@@ -1956,7 +1956,7 @@
<option>--log-short-format</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-short-format"/>
<para>
@@ -1980,7 +1980,7 @@
<option>--log-slow-admin-statements</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-slow-admin-statements"/>
<para>
@@ -2005,7 +2005,7 @@
<option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-slow-queries"/>
<para>
@@ -2042,7 +2042,7 @@
<option>--log-slow-slave-statements</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-slow-slave-statements"/>
<para>
@@ -2071,7 +2071,7 @@
<option>--log-tc=<replaceable>file_name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-tc"/>
<para>
@@ -2098,7 +2098,7 @@
<option>--log-tc-size=<replaceable>size</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-tc-size"/>
<para>
@@ -2122,7 +2122,7 @@
<option>--log-warnings[=<replaceable>level</replaceable>]</option>,
<option>-W [<replaceable>level</replaceable>]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-warnings"/>
<para>
@@ -2154,7 +2154,7 @@
<option>--low-priority-updates</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:low-priority-updates"/>
<para>
@@ -2187,7 +2187,7 @@
<option>--min-examined-row-limit=<replaceable>number</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:min-examined-row-limit"/>
<para>
@@ -2215,7 +2215,7 @@
<option>--max-binlog-dump-events</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:max-binlog-dump-events"/>
<para>
@@ -2238,7 +2238,7 @@
<option>--memlock</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:memlock"/>
<para>
@@ -2268,7 +2268,7 @@
<option>--myisam-recover[=<replaceable>option</replaceable>[,<replaceable>option</replaceable>]...]]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:myisam-recover"/>
<para>
@@ -2348,7 +2348,7 @@
<primary>mysqld</primary>
<secondary>ndb-cluster-connection-pool option</secondary>
</indexterm>
-
+
<indexterm>
<primary>ndb-cluster-connection-pool option</primary>
<secondary>mysqld</secondary>
@@ -2356,7 +2356,7 @@
<option>--ndb-cluster-connection-pool=<replaceable>value</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:ndb-cluster-connection-pool"/>
&mccge-warning-begin;
@@ -2407,7 +2407,7 @@
<option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:ndb-connectstring"/>
<para>
@@ -2433,7 +2433,7 @@
<option>--ndbcluster</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:ndbcluster"/>
<para>
@@ -2458,7 +2458,7 @@
<option>--old-passwords</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:old-passwords"/>
<para>
@@ -2483,7 +2483,7 @@
<option>--old-style-user-limits</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:old-style-user-limits"/>
<para>
@@ -2509,7 +2509,7 @@
<option>--one-thread</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:one-thread"/>
<para>
@@ -2540,7 +2540,7 @@
<option>--open-files-limit=<replaceable>count</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:open-files-limit"/>
<para>
@@ -2573,7 +2573,7 @@
<option>--pid-file=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:pid-file"/>
<para>
@@ -2598,7 +2598,7 @@
<option>--port=<replaceable>port_num</replaceable></option>,
<option>-P <replaceable>port_num</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:port"/>
<para>
@@ -2623,7 +2623,7 @@
<option>--port-open-timeout=<replaceable>num</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:port-open-timeout"/>
<para>
@@ -2651,7 +2651,7 @@
<option>--safe-mode</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:safe-mode"/>
<para>
@@ -2674,7 +2674,7 @@
<option>--safe-show-database</option>
(<emphasis>DEPRECATED</emphasis>)
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:safe-show-database"/>
<para>
@@ -2696,7 +2696,7 @@
<option>--safe-user-create</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:safe-user-create"/>
<para>
@@ -2736,7 +2736,7 @@
<option>--secure-auth</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:secure-auth"/>
<para>
@@ -2759,7 +2759,7 @@
<option>--secure-file-priv=<replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:secure-file-priv"/>
<para>
@@ -2789,7 +2789,7 @@
<option>--shared-memory</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:shared-memory"/>
<para>
@@ -2812,7 +2812,7 @@
<option>--shared-memory-base-name=<replaceable>name</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:shared-memory-base-name"/>
<para>
@@ -2837,7 +2837,7 @@
<option>--skip-concurrent-insert</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-concurrent-insert"/>
<para>
@@ -2871,9 +2871,9 @@
<option>--skip-external-locking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-external-locking"/>
-
+
<para>
Do not use external locking (system locking). For more
information about external locking, including conditions
@@ -2901,7 +2901,7 @@
<option>--skip-grant-tables</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-grant-tables"/>
<para>
@@ -2941,7 +2941,7 @@
<option>--skip-host-cache</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-host-cache"/>
<para>
@@ -2965,7 +2965,7 @@
<option>--skip-innodb</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-innodb"/>
<para>
@@ -2990,7 +2990,7 @@
<option>--skip-name-resolve</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-name-resolve"/>
<para>
@@ -3016,7 +3016,7 @@
<option>--skip-ndbcluster</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-ndbcluster"/>
<para>
@@ -3045,7 +3045,7 @@
<option>--skip-networking</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-networking"/>
<para>
@@ -3072,7 +3072,7 @@
<option>--sporadic-binlog-dump-fail</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:sporadic-binlog-dump-fail"/>
<para>
@@ -3118,7 +3118,7 @@
<option>--standalone</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:standalone"/>
<para>
@@ -3152,7 +3152,7 @@
<option>--symbolic-links</option>,
<option>--skip-symbolic-links</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:symbolic-links"/>
<para>
@@ -3204,7 +3204,7 @@
<option>--skip-safemalloc</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-safemalloc"/>
<para>
@@ -3231,7 +3231,7 @@
<option>--skip-show-database</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-show-database"/>
<para>
@@ -3262,7 +3262,7 @@
<option>--skip-stack-trace</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-stack-trace"/>
<para>
@@ -3289,7 +3289,7 @@
<option>--skip-thread-priority</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:skip-thread-priority"/>
<para>
@@ -3311,7 +3311,7 @@
<option>--slow-query-log[={0|1}]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:slow-query-log"/>
<para>
@@ -3374,7 +3374,7 @@
<option>--sql-mode=<replaceable>value</replaceable>[,<replaceable>value</replaceable>[,<replaceable>value</replaceable>...]]</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:sql-mode"/>
<para>
@@ -3396,18 +3396,20 @@
<option>--sysdate-is-now</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:sysdate-is-now"/>
<para>
- <function role="sql">SYSDATE()</function> by default returns the time
- at which it executes, not the time at which the statement
- in which it occurs begins executing. This differs from the
- behavior of <function role="sql">NOW()</function>. This option causes
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>. For information about the
- implications for binary logging and replication, see the
- description for <function role="sql">SYSDATE()</function> in
+ <function role="sql">SYSDATE()</function> by default
+ returns the time at which it executes, not the time at
+ which the statement in which it occurs begins executing.
+ This differs from the behavior of
+ <function role="sql">NOW()</function>. This option causes
+ <function role="sql">SYSDATE()</function> to be an alias
+ for <function role="sql">NOW()</function>. For information
+ about the implications for binary logging and replication,
+ see the description for
+ <function role="sql">SYSDATE()</function> in
<xref linkend="date-and-time-functions"/> and for
<literal>SET TIMESTAMP</literal> in
<xref linkend="set-option"/>.
@@ -3432,7 +3434,7 @@
<option>--tc-heuristic-recover={COMMIT|ROLLBACK}</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:tc-heuristic-recover"/>
<para>
@@ -3455,7 +3457,7 @@
<option>--temp-pool</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:temp-pool"/>
<para>
@@ -3484,7 +3486,7 @@
<option>--transaction-isolation=<replaceable>level</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:transaction-isolation"/>
<para>
@@ -3513,7 +3515,7 @@
<option>--tmpdir=<replaceable>path</replaceable></option>,
<option>-t <replaceable>path</replaceable></option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:tmpdir"/>
<para>
@@ -3556,7 +3558,7 @@
<option>-u
{<replaceable>user_name</replaceable>|<replaceable>user_id</replaceable>}</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:user"/>
<para>
@@ -3613,7 +3615,7 @@
<option>--version</option>, <option>-V</option>
</para>
-
+
<para condition="dynamic:optvar:item" role="5.1:mysqld:version"/>
<para>
@@ -5639,13 +5641,13 @@
abbreviations. This variable affects the output from the
<literal>DATE_FORMAT()</literal>,
<function role="sql">DAYNAME()</function> and
- <function role="sql">MONTHNAME()</function> functions. Locale names are
- POSIX-style values such as <literal>'ja_JP'</literal> or
- <literal>'pt_BR'</literal>. The default value is
- <literal>'en_US'</literal> regardless of your system's
- locale setting. For further information, see
- <xref linkend="locale-support"/>. This variable was added
- in MySQL 5.1.12.
+ <function role="sql">MONTHNAME()</function> functions.
+ Locale names are POSIX-style values such as
+ <literal>'ja_JP'</literal> or <literal>'pt_BR'</literal>.
+ The default value is <literal>'en_US'</literal> regardless
+ of your system's locale setting. For further information,
+ see <xref linkend="locale-support"/>. This variable was
+ added in MySQL 5.1.12.
</para>
</listitem>
Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/errors-problems-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 1887 bytes
@@ -3807,8 +3807,8 @@
</programlisting>
<para>
- <function role="sql">STRCMP()</function> is a string function, so it
- converts <literal>idate</literal> to a string in
+ <function role="sql">STRCMP()</function> is a string function,
+ so it converts <literal>idate</literal> to a string in
<literal>'YYYY-MM-DD'</literal> format and performs a string
comparison. It does not convert <literal>'20030505'</literal>
to the date <literal>'2003-05-05'</literal> and perform a date
@@ -5199,12 +5199,12 @@
depends on the function. The general rule is that bit
functions are performed with <literal>BIGINT</literal>
precision, <literal>IF</literal> and
- <function role="sql">ELT()</function> with <literal>BIGINT</literal> or
- <literal>DOUBLE</literal> precision, and the rest with
- <literal>DOUBLE</literal> precision. You should try to
- avoid using unsigned long long values if they resolve to
- be larger than 63 bits (9223372036854775807) for anything
- other than bit fields.
+ <function role="sql">ELT()</function> with
+ <literal>BIGINT</literal> or <literal>DOUBLE</literal>
+ precision, and the rest with <literal>DOUBLE</literal>
+ precision. You should try to avoid using unsigned long
+ long values if they resolve to be larger than 63 bits
+ (9223372036854775807) for anything other than bit fields.
</para>
</listitem>
Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/faqs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 603 bytes
@@ -149,8 +149,9 @@
<question>
<para>
- Does MySQL ¤t-series; have a <function role="sql">NOW()</function>
- function with fractions of seconds?
+ Does MySQL ¤t-series; have a
+ <function role="sql">NOW()</function> function with
+ fractions of seconds?
</para>
</question>
Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/installing-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 774 bytes
@@ -12608,8 +12608,8 @@
The presence or absence of whitespace following a
function name is used to distinguish between a built-in
function and stored function that have the same name
- (for example, <function role="sql">PI()</function> versus <literal>PI
- ()</literal>).
+ (for example, <function role="sql">PI()</function>
+ versus <literal>PI ()</literal>).
</para>
</listitem>
Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/language-structure-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 7; 2044 bytes
@@ -742,8 +742,8 @@
<para>
Bit values are returned as binary values. To display them in
printable form, add 0 or use a conversion function such as
- <function role="sql">BIN()</function>. High-order 0 bits are not displayed in
- the converted value.
+ <function role="sql">BIN()</function>. High-order 0 bits are not
+ displayed in the converted value.
</para>
<programlisting>
@@ -1967,7 +1967,8 @@
The presence or absence of whitespace following a function
name is used to distinguish between a built-in function and
stored function that have the same name, such as
- <function role="sql">PI()</function> versus <literal>PI ()</literal>.
+ <function role="sql">PI()</function> versus <literal>PI
+ ()</literal>.
</para>
</listitem>
@@ -2046,10 +2047,10 @@
For example, if you create a stored function named
<literal>PI</literal> in the <literal>test</literal> schema,
you invoke it as <literal>test.PI()</literal> because the
- server resolves <function role="sql">PI()</function> as a reference to
- the built-in function. As of 5.1.14, the server creates a
- warning if the stored function name collides with a built-in
- function name. The warning can be displayed with
+ server resolves <function role="sql">PI()</function> as a
+ reference to the built-in function. As of 5.1.14, the server
+ creates a warning if the stored function name collides with
+ a built-in function name. The warning can be displayed with
<literal>SHOW WARNINGS</literal>.
</para>
</listitem>
Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/partitioning-guide.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 11; 2944 bytes
@@ -884,10 +884,12 @@
<para>
MySQL partitioning is optimized for use with the
- <literal>TO_DAYS()</literal> and <function role="sql">YEAR()</function>
- functions. However, you can use other date and time functions that
- return an integer or <literal>NULL</literal>, such as
- <function role="sql">WEEKDAY()</function>, <function role="sql">DAYOFYEAR()</function>, or
+ <literal>TO_DAYS()</literal> and
+ <function role="sql">YEAR()</function> functions. However, you can
+ use other date and time functions that return an integer or
+ <literal>NULL</literal>, such as
+ <function role="sql">WEEKDAY()</function>,
+ <function role="sql">DAYOFYEAR()</function>, or
<function role="sql">MONTH()</function>. See
<xref linkend="date-and-time-functions"/>, for more information
about such functions.
@@ -1425,10 +1427,11 @@
<para>
Since we cannot use character values in value-lists, we need to
convert these into integers or <literal>NULL</literal>s. For
- this purpose, we can use the <function role="sql">ASCII()</function> function
- on the column value. In addition — due to the use of
- different applications at different times and locations —
- these codes may be either uppercase or lowercase, and the
+ this purpose, we can use the
+ <function role="sql">ASCII()</function> function on the column
+ value. In addition — due to the use of different
+ applications at different times and locations — these
+ codes may be either uppercase or lowercase, and the
<quote>empty</quote> value representing <quote>currently
unassigned</quote> may actually be a <literal>NULL</literal>, an
empty string, or a space character. A partitioned table that
@@ -4316,9 +4319,10 @@
expression consists of an equality or a range which can be reduced
to a set of equalities. It can also be employed when the
partitioning expression represents an increasing or decreasing
- relationship or uses a function such as <function role="sql">YEAR()</function>
- or <literal>TO_DAYS()</literal> that produces an integer value
- when applied to a <literal>DATE</literal> or
+ relationship or uses a function such as
+ <function role="sql">YEAR()</function> or
+ <literal>TO_DAYS()</literal> that produces an integer value when
+ applied to a <literal>DATE</literal> or
<literal>DATETIME</literal> column value. For example, suppose
that table <literal>t2</literal>, defined as shown here, is
partitioned on a <literal>DATE</literal> column:
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/partitioning.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 5, Lines Added: 18, Lines Deleted: 13; 3213 bytes
@@ -662,10 +662,12 @@
<para>
MySQL partitioning is optimized for use with the
- <literal>TO_DAYS()</literal> and <function role="sql">YEAR()</function>
- functions. However, you can use other date and time functions that
- return an integer or <literal>NULL</literal>, such as
- <function role="sql">WEEKDAY()</function>, <function role="sql">DAYOFYEAR()</function>, or
+ <literal>TO_DAYS()</literal> and
+ <function role="sql">YEAR()</function> functions. However, you can
+ use other date and time functions that return an integer or
+ <literal>NULL</literal>, such as
+ <function role="sql">WEEKDAY()</function>,
+ <function role="sql">DAYOFYEAR()</function>, or
<function role="sql">MONTH()</function>. See
<xref linkend="date-and-time-functions"/>, for more information
about such functions.
@@ -4100,7 +4102,8 @@
represents an increasing or decreasing relationship. Pruning can
also be applied for tables partitioned on a
<literal>DATE</literal> or <literal>DATETIME</literal> column when
- the partitioning expression uses the <function role="sql">YEAR()</function> or
+ the partitioning expression uses the
+ <function role="sql">YEAR()</function> or
<literal>TO_DAYS()</literal> function.
<note>
@@ -5225,10 +5228,11 @@
<listitem>
<para>
- <function role="sql">CEILING()</function> (<emphasis>see the Note
+ <function role="sql">CEILING()</function> (<emphasis>see
+ the Note
<citetitle><function role="sql">CEILING()</function> and
- <function role="sql">FLOOR()</function></citetitle> immediately
- following this list</emphasis>)
+ <function role="sql">FLOOR()</function></citetitle>
+ immediately following this list</emphasis>)
</para>
</listitem>
@@ -5270,10 +5274,10 @@
<listitem>
<para>
- <function role="sql">FLOOR()</function> (<emphasis>see the Note
- <citetitle><function role="sql">CEILING()</function> and
- <function role="sql">FLOOR()</function></citetitle> immediately
- following this list</emphasis>)
+ <function role="sql">FLOOR()</function> (<emphasis>see the
+ Note <citetitle><function role="sql">CEILING()</function>
+ and <function role="sql">FLOOR()</function></citetitle>
+ immediately following this list</emphasis>)
</para>
</listitem>
@@ -5354,7 +5358,8 @@
<note>
<formalpara>
- <title><function role="sql">CEILING()</function> and <function role="sql">FLOOR()</function></title>
+ <title><function role="sql">CEILING()</function> and
+ <function role="sql">FLOOR()</function></title>
<para>
Each of these functions returns an integer only if it is
Modified: trunk/refman-5.1/precision-math.xml
===================================================================
--- trunk/refman-5.1/precision-math.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/precision-math.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 4, Lines Added: 23, Lines Deleted: 20; 3673 bytes
@@ -108,9 +108,9 @@
<para>
<emphasis role="bold">Well-defined rounding behavior</emphasis>:
For exact-value numbers, the result of
- <function role="sql">ROUND()</function> depends on its argument, not on
- environmental factors such as how the underlying C library
- works.
+ <function role="sql">ROUND()</function> depends on its argument,
+ not on environmental factors such as how the underlying C
+ library works.
</para>
</listitem>
@@ -643,26 +643,29 @@
<para>
This section discusses precision math rounding for the
- <function role="sql">ROUND()</function> function and for inserts into columns
- with exact-value types (<literal>DECIMAL</literal> and integer).
+ <function role="sql">ROUND()</function> function and for inserts
+ into columns with exact-value types (<literal>DECIMAL</literal>
+ and integer).
</para>
<para>
- The <function role="sql">ROUND()</function> function rounds differently
- depending on whether its argument is exact or approximate:
+ The <function role="sql">ROUND()</function> function rounds
+ differently depending on whether its argument is exact or
+ approximate:
</para>
<itemizedlist>
<listitem>
<para>
- For exact-value numbers, <function role="sql">ROUND()</function> uses the
- <quote>round half up</quote> rule: A value with a fractional
- part of .5 or greater is rounded up to the next integer if
- positive or down to the next integer if negative. (In other
- words, it is rounded away from zero.) A value with a
- fractional part less than .5 is rounded down to the next
- integer if positive or up to the next integer if negative.
+ For exact-value numbers,
+ <function role="sql">ROUND()</function> uses the <quote>round
+ half up</quote> rule: A value with a fractional part of .5 or
+ greater is rounded up to the next integer if positive or down
+ to the next integer if negative. (In other words, it is
+ rounded away from zero.) A value with a fractional part less
+ than .5 is rounded down to the next integer if positive or up
+ to the next integer if negative.
</para>
</listitem>
@@ -670,9 +673,9 @@
<para>
For approximate-value numbers, the result depends on the C
library. On many systems, this means that
- <function role="sql">ROUND()</function> uses the <quote>round to nearest
- even</quote> rule: A value with any fractional part is rounded
- to the nearest even integer.
+ <function role="sql">ROUND()</function> uses the <quote>round
+ to nearest even</quote> rule: A value with any fractional part
+ is rounded to the nearest even integer.
</para>
</listitem>
@@ -817,9 +820,9 @@
<para>
Rounding behavior (for example, with the
- <function role="sql">ROUND()</function> function) is independent of the
- implementation of the underlying C library, which means that
- results are consistent from platform to platform.
+ <function role="sql">ROUND()</function> function) is independent
+ of the implementation of the underlying C library, which means
+ that results are consistent from platform to platform.
</para>
<para>
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/replication-configuration.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 812 bytes
@@ -1633,9 +1633,9 @@
<listitem>
<para>
Stored functions (not stored procedures) will execute with
- the same <function role="sql">NOW()</function> value as the calling
- statement. (This may be regarded both as a bad thing and a
- good thing.)
+ the same <function role="sql">NOW()</function> value as the
+ calling statement. (This may be regarded both as a bad thing
+ and a good thing.)
</para>
</listitem>
Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/replication-notes.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1758 bytes
@@ -48,9 +48,10 @@
example, you cannot replicate from MySQL ¤t-series; to
&previous-series;. However, these incompatibilities also can occur
for within-series replication. For example, the
- <function role="sql">SLEEP()</function> function is available in MySQL 5.0.12
- and up. If you use this function on the master server, you cannot
- replicate to a slave server that is older than MySQL 5.0.12.
+ <function role="sql">SLEEP()</function> function is available in
+ MySQL 5.0.12 and up. If you use this function on the master
+ server, you cannot replicate to a slave server that is older than
+ MySQL 5.0.12.
</para>
<para>
@@ -1192,9 +1193,9 @@
If the master uses MySQL 4.1, the same system time zone should
be set for both master and slave. Otherwise some statements will
not be replicated properly, such as statements that use the
- <function role="sql">NOW()</function> or <literal>FROM_UNIXTIME()</literal>
- functions. You can set the time zone in which MySQL server runs
- by using the
+ <function role="sql">NOW()</function> or
+ <literal>FROM_UNIXTIME()</literal> functions. You can set the
+ time zone in which MySQL server runs by using the
<option>--timezone=<replaceable>timezone_name</replaceable></option>
option of the <filename>mysqld_safe</filename> script or by
setting the <literal>TZ</literal> environment variable. Both
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/sql-syntax.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 12; 2471 bytes
@@ -13520,9 +13520,9 @@
<listitem>
<para>
For help on a specific help topic, such as the
- <function role="sql">ASCII()</function> function or the <literal>CREATE
- TABLE</literal> statement, use the associated keyword or
- keywords:
+ <function role="sql">ASCII()</function> function or the
+ <literal>CREATE TABLE</literal> statement, use the
+ associated keyword or keywords:
</para>
<programlisting>
@@ -13746,9 +13746,9 @@
<para>
Before MySQL 5.1.17, if you intend to use the
- <literal>HELP</literal> statement while other tables are
- locked with <literal>LOCK TABLES</literal>, you must also lock
- the required
+ <literal>HELP</literal> statement while other tables are locked
+ with <literal>LOCK TABLES</literal>, you must also lock the
+ required
<literal>mysql.help_<replaceable>xxx</replaceable></literal>
tables. See <xref linkend="lock-tables"/>.
</para>
@@ -19198,13 +19198,14 @@
<para>
<literal>SET TIMESTAMP</literal> affects the value returned
by <function role="sql">NOW()</function> but not by
- <function role="sql">SYSDATE()</function>. This means that timestamp
- settings in the binary log have no effect on invocations of
- <function role="sql">SYSDATE()</function>. The server can be started with
- the <option>--sysdate-is-now</option> option to cause
+ <function role="sql">SYSDATE()</function>. This means that
+ timestamp settings in the binary log have no effect on
+ invocations of <function role="sql">SYSDATE()</function>.
+ The server can be started with the
+ <option>--sysdate-is-now</option> option to cause
<function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>, in which case <literal>SET
- TIMESTAMP</literal> affects both functions.
+ <function role="sql">NOW()</function>, in which case
+ <literal>SET TIMESTAMP</literal> affects both functions.
</para>
</listitem>
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/stored-procedures.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 27, Lines Deleted: 25; 4069 bytes
@@ -499,15 +499,16 @@
</para>
<para>
- A routine that contains the <function role="sql">NOW()</function> function
- (or its synonyms) or <function role="sql">RAND()</function> is
- non-deterministic, but it might still be replication-safe. For
- <function role="sql">NOW()</function>, the binary log includes the timestamp
- and replicates correctly. <function role="sql">RAND()</function> also
- replicates correctly as long as it is invoked only once within a
- routine. (You can consider the routine execution timestamp and
- random number seed as implicit inputs that are identical on the
- master and slave.)
+ A routine that contains the
+ <function role="sql">NOW()</function> function (or its synonyms)
+ or <function role="sql">RAND()</function> is non-deterministic,
+ but it might still be replication-safe. For
+ <function role="sql">NOW()</function>, the binary log includes
+ the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates correctly
+ as long as it is invoked only once within a routine. (You can
+ consider the routine execution timestamp and random number seed
+ as implicit inputs that are identical on the master and slave.)
</para>
<para>
@@ -2758,27 +2759,28 @@
</para>
<para>
- Use of the <function role="sql">NOW()</function> function (or its
- synonyms) or <function role="sql">RAND()</function> does not
+ Use of the <function role="sql">NOW()</function> function
+ (or its synonyms) or
+ <function role="sql">RAND()</function> does not
necessarily make a function non-deterministic. For
- <function role="sql">NOW()</function>, the binary log includes the
- timestamp and replicates correctly.
- <function role="sql">RAND()</function> also replicates correctly as
- long as it is invoked only once within a function. (You
- can consider the function execution timestamp and random
- number seed as implicit inputs that are identical on the
- master and slave.)
+ <function role="sql">NOW()</function>, the binary log
+ includes the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates
+ correctly as long as it is invoked only once within a
+ function. (You can consider the function execution
+ timestamp and random number seed as implicit inputs that
+ are identical on the master and slave.)
</para>
<para>
- <function role="sql">SYSDATE()</function> is not affected by the
- timestamps in the binary log, so it causes stored routines
- to be non-deterministic if statement-based logging is
- used. This does not occur if row-based logging is used, or
- if the server is started with the
+ <function role="sql">SYSDATE()</function> is not affected
+ by the timestamps in the binary log, so it causes stored
+ routines to be non-deterministic if statement-based
+ logging is used. This does not occur if row-based logging
+ is used, or if the server is started with the
<option>--sysdate-is-now</option> option to cause
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>.
+ <function role="sql">SYSDATE()</function> to be an alias
+ for <function role="sql">NOW()</function>.
</para>
</listitem>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-5.1/tutorial.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 13; 3233 bytes
@@ -1727,16 +1727,17 @@
</programlisting>
<para>
- Here, <function role="sql">YEAR()</function> pulls out the year part of a
- date and <function role="sql">RIGHT()</function> pulls off the
+ Here, <function role="sql">YEAR()</function> pulls out the
+ year part of a 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
- <function role="sql">CURDATE()</function> occurs earlier in the year than
- <literal>birth</literal>. The full expression is somewhat
- ungainly, so an <emphasis>alias</emphasis>
+ <function role="sql">CURDATE()</function> occurs earlier in
+ the year than <literal>birth</literal>. The full expression is
+ somewhat ungainly, so an <emphasis>alias</emphasis>
(<literal>age</literal>) is used to make the output column
label more meaningful.
</para>
@@ -1832,11 +1833,13 @@
irrelevant; you simply want to extract the month part of the
<literal>birth</literal> column. MySQL provides several
functions for extracting parts of dates, such as
- <function role="sql">YEAR()</function>, <function role="sql">MONTH()</function>, and
- <function role="sql">DAYOFMONTH()</function>. <function role="sql">MONTH()</function> is
- the appropriate function here. To see how it works, run a
- simple query that displays the value of both
- <literal>birth</literal> and <literal>MONTH(birth)</literal>:
+ <function role="sql">YEAR()</function>,
+ <function role="sql">MONTH()</function>, and
+ <function role="sql">DAYOFMONTH()</function>.
+ <function role="sql">MONTH()</function> is the appropriate
+ function here. To see how it works, run a simple query that
+ displays the value of both <literal>birth</literal> and
+ <literal>MONTH(birth)</literal>:
</para>
<programlisting>
@@ -1886,9 +1889,10 @@
current month is, so that you do not have to use the number
for a particular month. <literal>DATE_ADD()</literal> allows
you to add a time interval to a given date. If you add a month
- to the value of <function role="sql">CURDATE()</function>, then extract the
- month part with <function role="sql">MONTH()</function>, the result
- produces the month in which to look for birthdays:
+ to the value of <function role="sql">CURDATE()</function>,
+ then extract the month part with
+ <function role="sql">MONTH()</function>, the result produces
+ the month in which to look for birthdays:
</para>
<programlisting>
Modified: trunk/refman-6.0/client-utility-programs.xml
===================================================================
--- trunk/refman-6.0/client-utility-programs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/client-utility-programs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 867 bytes
@@ -9364,8 +9364,8 @@
<entry><literal>0d</literal></entry>
<entry><literal>RAND_EVENT</literal></entry>
<entry>Used to send information about random values if the
- <function role="sql">RAND()</function> function is used in the
- statement.</entry>
+ <function role="sql">RAND()</function> function is
+ used in the statement.</entry>
</row>
<row>
<entry><literal>0e</literal></entry>
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/data-types.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 9; 2692 bytes
@@ -1954,10 +1954,11 @@
for a column. With one exception, the default value must be a
constant; it cannot be a function or an expression. This means,
for example, that you cannot set the default for a date column
- to be the value of a function such as <function role="sql">NOW()</function>
- or <literal>CURRENT_DATE</literal>. The exception is that you
- can specify <literal>CURRENT_TIMESTAMP</literal> as the default
- for a <literal>TIMESTAMP</literal> column. See
+ to be the value of a function such as
+ <function role="sql">NOW()</function> or
+ <literal>CURRENT_DATE</literal>. The exception is that you can
+ specify <literal>CURRENT_TIMESTAMP</literal> as the default for
+ a <literal>TIMESTAMP</literal> column. See
<xref linkend="timestamp"/>.
</para>
@@ -3290,11 +3291,12 @@
<para>
<literal>CURRENT_TIMESTAMP</literal> or any of its
synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
- <function role="sql">NOW()</function>, <literal>LOCALTIME</literal>,
+ <function role="sql">NOW()</function>,
+ <literal>LOCALTIME</literal>,
<function role="sql">LOCALTIME()</function>,
<literal>LOCALTIMESTAMP</literal>, or
- <function role="sql">LOCALTIMESTAMP()</function>) can be used in the
- <literal>DEFAULT</literal> and <literal>ON
+ <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
not allowed. Its range of values does not align with those
@@ -4421,8 +4423,8 @@
you want more than <literal>max_sort_length</literal> bytes
to be significant is to convert the column value into a
fixed-length object. The standard way to do this is with the
- <function role="sql">SUBSTRING()</function> function. For example, the
- following statement causes 2000 bytes of the
+ <function role="sql">SUBSTRING()</function> function. For
+ example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
for sorting:
</para>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/dba-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 14; 2754 bytes
@@ -3112,14 +3112,16 @@
</para>
<para>
- <function role="sql">SYSDATE()</function> by default returns the time
- at which it executes, not the time at which the statement
- in which it occurs begins executing. This differs from the
- behavior of <function role="sql">NOW()</function>. This option causes
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>. For information about the
- implications for binary logging and replication, see the
- description for <function role="sql">SYSDATE()</function> in
+ <function role="sql">SYSDATE()</function> by default
+ returns the time at which it executes, not the time at
+ which the statement in which it occurs begins executing.
+ This differs from the behavior of
+ <function role="sql">NOW()</function>. This option causes
+ <function role="sql">SYSDATE()</function> to be an alias
+ for <function role="sql">NOW()</function>. For information
+ about the implications for binary logging and replication,
+ see the description for
+ <function role="sql">SYSDATE()</function> in
<xref linkend="date-and-time-functions"/> and for
<literal>SET TIMESTAMP</literal> in
<xref linkend="set-option"/>.
@@ -5272,12 +5274,12 @@
abbreviations. This variable affects the output from the
<literal>DATE_FORMAT()</literal>,
<function role="sql">DAYNAME()</function> and
- <function role="sql">MONTHNAME()</function> functions. Locale names are
- POSIX-style values such as <literal>'ja_JP'</literal> or
- <literal>'pt_BR'</literal>. The default value is
- <literal>'en_US'</literal> regardless of your system's
- locale setting. For further information, see
- <xref linkend="locale-support"/>.
+ <function role="sql">MONTHNAME()</function> functions.
+ Locale names are POSIX-style values such as
+ <literal>'ja_JP'</literal> or <literal>'pt_BR'</literal>.
+ The default value is <literal>'en_US'</literal> regardless
+ of your system's locale setting. For further information,
+ see <xref linkend="locale-support"/>.
</para>
</listitem>
Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/errors-problems.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 1872 bytes
@@ -3802,8 +3802,8 @@
</programlisting>
<para>
- <function role="sql">STRCMP()</function> is a string function, so it
- converts <literal>idate</literal> to a string in
+ <function role="sql">STRCMP()</function> is a string function,
+ so it converts <literal>idate</literal> to a string in
<literal>'YYYY-MM-DD'</literal> format and performs a string
comparison. It does not convert <literal>'20030505'</literal>
to the date <literal>'2003-05-05'</literal> and perform a date
@@ -5184,12 +5184,12 @@
depends on the function. The general rule is that bit
functions are performed with <literal>BIGINT</literal>
precision, <literal>IF</literal> and
- <function role="sql">ELT()</function> with <literal>BIGINT</literal> or
- <literal>DOUBLE</literal> precision, and the rest with
- <literal>DOUBLE</literal> precision. You should try to
- avoid using unsigned long long values if they resolve to
- be larger than 63 bits (9223372036854775807) for anything
- other than bit fields.
+ <function role="sql">ELT()</function> with
+ <literal>BIGINT</literal> or <literal>DOUBLE</literal>
+ precision, and the rest with <literal>DOUBLE</literal>
+ precision. You should try to avoid using unsigned long
+ long values if they resolve to be larger than 63 bits
+ (9223372036854775807) for anything other than bit fields.
</para>
</listitem>
Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/faqs.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 603 bytes
@@ -149,8 +149,9 @@
<question>
<para>
- Does MySQL ¤t-series; have a <function role="sql">NOW()</function>
- function with fractions of seconds?
+ Does MySQL ¤t-series; have a
+ <function role="sql">NOW()</function> function with
+ fractions of seconds?
</para>
</question>
Modified: trunk/refman-6.0/language-structure-core.xml
===================================================================
--- trunk/refman-6.0/language-structure-core.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/language-structure-core.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 8; 2063 bytes
@@ -742,8 +742,8 @@
<para>
Bit values are returned as binary values. To display them in
printable form, add 0 or use a conversion function such as
- <function role="sql">BIN()</function>. High-order 0 bits are not displayed in
- the converted value.
+ <function role="sql">BIN()</function>. High-order 0 bits are not
+ displayed in the converted value.
</para>
<programlisting>
@@ -1945,7 +1945,8 @@
The presence or absence of whitespace following a function
name is used to distinguish between a built-in function and
stored function that have the same name, such as
- <function role="sql">PI()</function> versus <literal>PI ()</literal>.
+ <function role="sql">PI()</function> versus <literal>PI
+ ()</literal>.
</para>
</listitem>
@@ -2017,11 +2018,11 @@
For example, if you create a stored function named
<literal>PI</literal> in the <literal>test</literal> schema,
you invoke it as <literal>test.PI()</literal> because the
- server resolves <function role="sql">PI()</function> as a reference to
- the built-in function. The server creates a warning if the
- stored function name collides with a built-in function name.
- The warning can be displayed with <literal>SHOW
- WARNINGS</literal>.
+ server resolves <function role="sql">PI()</function> as a
+ reference to the built-in function. The server creates a
+ warning if the stored function name collides with a built-in
+ function name. The warning can be displayed with
+ <literal>SHOW WARNINGS</literal>.
</para>
</listitem>
Modified: trunk/refman-6.0/partitioning-guide.xml
===================================================================
--- trunk/refman-6.0/partitioning-guide.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/partitioning-guide.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 11; 2944 bytes
@@ -854,10 +854,12 @@
<para>
MySQL partitioning is optimized for use with the
- <literal>TO_DAYS()</literal> and <function role="sql">YEAR()</function>
- functions. However, you can use other date and time functions that
- return an integer or <literal>NULL</literal>, such as
- <function role="sql">WEEKDAY()</function>, <function role="sql">DAYOFYEAR()</function>, or
+ <literal>TO_DAYS()</literal> and
+ <function role="sql">YEAR()</function> functions. However, you can
+ use other date and time functions that return an integer or
+ <literal>NULL</literal>, such as
+ <function role="sql">WEEKDAY()</function>,
+ <function role="sql">DAYOFYEAR()</function>, or
<function role="sql">MONTH()</function>. See
<xref linkend="date-and-time-functions"/>, for more information
about such functions.
@@ -1394,10 +1396,11 @@
<para>
Since we cannot use character values in value-lists, we need to
convert these into integers or <literal>NULL</literal>s. For
- this purpose, we can use the <function role="sql">ASCII()</function> function
- on the column value. In addition — due to the use of
- different applications at different times and locations —
- these codes may be either uppercase or lowercase, and the
+ this purpose, we can use the
+ <function role="sql">ASCII()</function> function on the column
+ value. In addition — due to the use of different
+ applications at different times and locations — these
+ codes may be either uppercase or lowercase, and the
<quote>empty</quote> value representing <quote>currently
unassigned</quote> may actually be a <literal>NULL</literal>, an
empty string, or a space character. A partitioned table that
@@ -4233,9 +4236,10 @@
expression consists of an equality or a range which can be reduced
to a set of equalities. It can also be employed when the
partitioning expression represents an increasing or decreasing
- relationship or uses a function such as <function role="sql">YEAR()</function>
- or <literal>TO_DAYS()</literal> that produces an integer value
- when applied to a <literal>DATE</literal> or
+ relationship or uses a function such as
+ <function role="sql">YEAR()</function> or
+ <literal>TO_DAYS()</literal> that produces an integer value when
+ applied to a <literal>DATE</literal> or
<literal>DATETIME</literal> column value. For example, suppose
that table <literal>t2</literal>, defined as shown here, is
partitioned on a <literal>DATE</literal> column:
Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/partitioning.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 5, Lines Added: 18, Lines Deleted: 13; 3213 bytes
@@ -631,10 +631,12 @@
<para>
MySQL partitioning is optimized for use with the
- <literal>TO_DAYS()</literal> and <function role="sql">YEAR()</function>
- functions. However, you can use other date and time functions that
- return an integer or <literal>NULL</literal>, such as
- <function role="sql">WEEKDAY()</function>, <function role="sql">DAYOFYEAR()</function>, or
+ <literal>TO_DAYS()</literal> and
+ <function role="sql">YEAR()</function> functions. However, you can
+ use other date and time functions that return an integer or
+ <literal>NULL</literal>, such as
+ <function role="sql">WEEKDAY()</function>,
+ <function role="sql">DAYOFYEAR()</function>, or
<function role="sql">MONTH()</function>. See
<xref linkend="date-and-time-functions"/>, for more information
about such functions.
@@ -4000,7 +4002,8 @@
represents an increasing or decreasing relationship. Pruning can
also be applied for tables partitioned on a
<literal>DATE</literal> or <literal>DATETIME</literal> column when
- the partitioning expression uses the <function role="sql">YEAR()</function> or
+ the partitioning expression uses the
+ <function role="sql">YEAR()</function> or
<literal>TO_DAYS()</literal> function.
<note>
@@ -5091,10 +5094,11 @@
<listitem>
<para>
- <function role="sql">CEILING()</function> (<emphasis>see the Note
+ <function role="sql">CEILING()</function> (<emphasis>see
+ the Note
<citetitle><function role="sql">CEILING()</function> and
- <function role="sql">FLOOR()</function></citetitle> immediately
- following this list</emphasis>)
+ <function role="sql">FLOOR()</function></citetitle>
+ immediately following this list</emphasis>)
</para>
</listitem>
@@ -5136,10 +5140,10 @@
<listitem>
<para>
- <function role="sql">FLOOR()</function> (<emphasis>see the Note
- <citetitle><function role="sql">CEILING()</function> and
- <function role="sql">FLOOR()</function></citetitle> immediately
- following this list</emphasis>)
+ <function role="sql">FLOOR()</function> (<emphasis>see the
+ Note <citetitle><function role="sql">CEILING()</function>
+ and <function role="sql">FLOOR()</function></citetitle>
+ immediately following this list</emphasis>)
</para>
</listitem>
@@ -5220,7 +5224,8 @@
<note>
<formalpara>
- <title><function role="sql">CEILING()</function> and <function role="sql">FLOOR()</function></title>
+ <title><function role="sql">CEILING()</function> and
+ <function role="sql">FLOOR()</function></title>
<para>
Each of these functions returns an integer only if it is
Modified: trunk/refman-6.0/precision-math.xml
===================================================================
--- trunk/refman-6.0/precision-math.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/precision-math.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 4, Lines Added: 23, Lines Deleted: 20; 3673 bytes
@@ -108,9 +108,9 @@
<para>
<emphasis role="bold">Well-defined rounding behavior</emphasis>:
For exact-value numbers, the result of
- <function role="sql">ROUND()</function> depends on its argument, not on
- environmental factors such as how the underlying C library
- works.
+ <function role="sql">ROUND()</function> depends on its argument,
+ not on environmental factors such as how the underlying C
+ library works.
</para>
</listitem>
@@ -643,26 +643,29 @@
<para>
This section discusses precision math rounding for the
- <function role="sql">ROUND()</function> function and for inserts into columns
- with exact-value types (<literal>DECIMAL</literal> and integer).
+ <function role="sql">ROUND()</function> function and for inserts
+ into columns with exact-value types (<literal>DECIMAL</literal>
+ and integer).
</para>
<para>
- The <function role="sql">ROUND()</function> function rounds differently
- depending on whether its argument is exact or approximate:
+ The <function role="sql">ROUND()</function> function rounds
+ differently depending on whether its argument is exact or
+ approximate:
</para>
<itemizedlist>
<listitem>
<para>
- For exact-value numbers, <function role="sql">ROUND()</function> uses the
- <quote>round half up</quote> rule: A value with a fractional
- part of .5 or greater is rounded up to the next integer if
- positive or down to the next integer if negative. (In other
- words, it is rounded away from zero.) A value with a
- fractional part less than .5 is rounded down to the next
- integer if positive or up to the next integer if negative.
+ For exact-value numbers,
+ <function role="sql">ROUND()</function> uses the <quote>round
+ half up</quote> rule: A value with a fractional part of .5 or
+ greater is rounded up to the next integer if positive or down
+ to the next integer if negative. (In other words, it is
+ rounded away from zero.) A value with a fractional part less
+ than .5 is rounded down to the next integer if positive or up
+ to the next integer if negative.
</para>
</listitem>
@@ -670,9 +673,9 @@
<para>
For approximate-value numbers, the result depends on the C
library. On many systems, this means that
- <function role="sql">ROUND()</function> uses the <quote>round to nearest
- even</quote> rule: A value with any fractional part is rounded
- to the nearest even integer.
+ <function role="sql">ROUND()</function> uses the <quote>round
+ to nearest even</quote> rule: A value with any fractional part
+ is rounded to the nearest even integer.
</para>
</listitem>
@@ -817,9 +820,9 @@
<para>
Rounding behavior (for example, with the
- <function role="sql">ROUND()</function> function) is independent of the
- implementation of the underlying C library, which means that
- results are consistent from platform to platform.
+ <function role="sql">ROUND()</function> function) is independent
+ of the implementation of the underlying C library, which means
+ that results are consistent from platform to platform.
</para>
<para>
Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/replication-configuration.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 812 bytes
@@ -1627,9 +1627,9 @@
<listitem>
<para>
Stored functions (not stored procedures) will execute with
- the same <function role="sql">NOW()</function> value as the calling
- statement. (This may be regarded both as a bad thing and a
- good thing.)
+ the same <function role="sql">NOW()</function> value as the
+ calling statement. (This may be regarded both as a bad thing
+ and a good thing.)
</para>
</listitem>
Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/replication-notes.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1758 bytes
@@ -48,9 +48,10 @@
example, you cannot replicate from MySQL ¤t-series; to
&previous-series;. However, these incompatibilities also can occur
for within-series replication. For example, the
- <function role="sql">SLEEP()</function> function is available in MySQL 5.0.12
- and up. If you use this function on the master server, you cannot
- replicate to a slave server that is older than MySQL 5.0.12.
+ <function role="sql">SLEEP()</function> function is available in
+ MySQL 5.0.12 and up. If you use this function on the master
+ server, you cannot replicate to a slave server that is older than
+ MySQL 5.0.12.
</para>
<para>
@@ -1161,9 +1162,9 @@
If the master uses MySQL 4.1, the same system time zone should
be set for both master and slave. Otherwise some statements will
not be replicated properly, such as statements that use the
- <function role="sql">NOW()</function> or <literal>FROM_UNIXTIME()</literal>
- functions. You can set the time zone in which MySQL server runs
- by using the
+ <function role="sql">NOW()</function> or
+ <literal>FROM_UNIXTIME()</literal> functions. You can set the
+ time zone in which MySQL server runs by using the
<option>--timezone=<replaceable>timezone_name</replaceable></option>
option of the <filename>mysqld_safe</filename> script or by
setting the <literal>TZ</literal> environment variable. Both
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/sql-syntax.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 9; 1932 bytes
@@ -13917,9 +13917,9 @@
<listitem>
<para>
For help on a specific help topic, such as the
- <function role="sql">ASCII()</function> function or the <literal>CREATE
- TABLE</literal> statement, use the associated keyword or
- keywords:
+ <function role="sql">ASCII()</function> function or the
+ <literal>CREATE TABLE</literal> statement, use the
+ associated keyword or keywords:
</para>
<programlisting>
@@ -19586,13 +19586,14 @@
<para>
<literal>SET TIMESTAMP</literal> affects the value returned
by <function role="sql">NOW()</function> but not by
- <function role="sql">SYSDATE()</function>. This means that timestamp
- settings in the binary log have no effect on invocations of
- <function role="sql">SYSDATE()</function>. The server can be started with
- the <option>--sysdate-is-now</option> option to cause
+ <function role="sql">SYSDATE()</function>. This means that
+ timestamp settings in the binary log have no effect on
+ invocations of <function role="sql">SYSDATE()</function>.
+ The server can be started with the
+ <option>--sysdate-is-now</option> option to cause
<function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>, in which case <literal>SET
- TIMESTAMP</literal> affects both functions.
+ <function role="sql">NOW()</function>, in which case
+ <literal>SET TIMESTAMP</literal> affects both functions.
</para>
</listitem>
Modified: trunk/refman-6.0/stored-procedures.xml
===================================================================
--- trunk/refman-6.0/stored-procedures.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/stored-procedures.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 2, Lines Added: 27, Lines Deleted: 25; 4069 bytes
@@ -485,15 +485,16 @@
</para>
<para>
- A routine that contains the <function role="sql">NOW()</function> function
- (or its synonyms) or <function role="sql">RAND()</function> is
- non-deterministic, but it might still be replication-safe. For
- <function role="sql">NOW()</function>, the binary log includes the timestamp
- and replicates correctly. <function role="sql">RAND()</function> also
- replicates correctly as long as it is invoked only once within a
- routine. (You can consider the routine execution timestamp and
- random number seed as implicit inputs that are identical on the
- master and slave.)
+ A routine that contains the
+ <function role="sql">NOW()</function> function (or its synonyms)
+ or <function role="sql">RAND()</function> is non-deterministic,
+ but it might still be replication-safe. For
+ <function role="sql">NOW()</function>, the binary log includes
+ the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates correctly
+ as long as it is invoked only once within a routine. (You can
+ consider the routine execution timestamp and random number seed
+ as implicit inputs that are identical on the master and slave.)
</para>
<para>
@@ -2737,27 +2738,28 @@
</para>
<para>
- Use of the <function role="sql">NOW()</function> function (or its
- synonyms) or <function role="sql">RAND()</function> does not
+ Use of the <function role="sql">NOW()</function> function
+ (or its synonyms) or
+ <function role="sql">RAND()</function> does not
necessarily make a function non-deterministic. For
- <function role="sql">NOW()</function>, the binary log includes the
- timestamp and replicates correctly.
- <function role="sql">RAND()</function> also replicates correctly as
- long as it is invoked only once within a function. (You
- can consider the function execution timestamp and random
- number seed as implicit inputs that are identical on the
- master and slave.)
+ <function role="sql">NOW()</function>, the binary log
+ includes the timestamp and replicates correctly.
+ <function role="sql">RAND()</function> also replicates
+ correctly as long as it is invoked only once within a
+ function. (You can consider the function execution
+ timestamp and random number seed as implicit inputs that
+ are identical on the master and slave.)
</para>
<para>
- <function role="sql">SYSDATE()</function> is not affected by the
- timestamps in the binary log, so it causes stored routines
- to be non-deterministic if statement-based logging is
- used. This does not occur if row-based logging is used, or
- if the server is started with the
+ <function role="sql">SYSDATE()</function> is not affected
+ by the timestamps in the binary log, so it causes stored
+ routines to be non-deterministic if statement-based
+ logging is used. This does not occur if row-based logging
+ is used, or if the server is started with the
<option>--sysdate-is-now</option> option to cause
- <function role="sql">SYSDATE()</function> to be an alias for
- <function role="sql">NOW()</function>.
+ <function role="sql">SYSDATE()</function> to be an alias
+ for <function role="sql">NOW()</function>.
</para>
</listitem>
Modified: trunk/refman-6.0/tutorial.xml
===================================================================
--- trunk/refman-6.0/tutorial.xml 2007-12-05 02:31:04 UTC (rev 9114)
+++ trunk/refman-6.0/tutorial.xml 2007-12-05 02:45:23 UTC (rev 9115)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 13; 3233 bytes
@@ -1727,16 +1727,17 @@
</programlisting>
<para>
- Here, <function role="sql">YEAR()</function> pulls out the year part of a
- date and <function role="sql">RIGHT()</function> pulls off the
+ Here, <function role="sql">YEAR()</function> pulls out the
+ year part of a 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
- <function role="sql">CURDATE()</function> occurs earlier in the year than
- <literal>birth</literal>. The full expression is somewhat
- ungainly, so an <emphasis>alias</emphasis>
+ <function role="sql">CURDATE()</function> occurs earlier in
+ the year than <literal>birth</literal>. The full expression is
+ somewhat ungainly, so an <emphasis>alias</emphasis>
(<literal>age</literal>) is used to make the output column
label more meaningful.
</para>
@@ -1832,11 +1833,13 @@
irrelevant; you simply want to extract the month part of the
<literal>birth</literal> column. MySQL provides several
functions for extracting parts of dates, such as
- <function role="sql">YEAR()</function>, <function role="sql">MONTH()</function>, and
- <function role="sql">DAYOFMONTH()</function>. <function role="sql">MONTH()</function> is
- the appropriate function here. To see how it works, run a
- simple query that displays the value of both
- <literal>birth</literal> and <literal>MONTH(birth)</literal>:
+ <function role="sql">YEAR()</function>,
+ <function role="sql">MONTH()</function>, and
+ <function role="sql">DAYOFMONTH()</function>.
+ <function role="sql">MONTH()</function> is the appropriate
+ function here. To see how it works, run a simple query that
+ displays the value of both <literal>birth</literal> and
+ <literal>MONTH(birth)</literal>:
</para>
<programlisting>
@@ -1886,9 +1889,10 @@
current month is, so that you do not have to use the number
for a particular month. <literal>DATE_ADD()</literal> allows
you to add a time interval to a given date. If you add a month
- to the value of <function role="sql">CURDATE()</function>, then extract the
- month part with <function role="sql">MONTH()</function>, the result
- produces the month in which to look for birthdays:
+ to the value of <function role="sql">CURDATE()</function>,
+ then extract the month part with
+ <function role="sql">MONTH()</function>, the result produces
+ the month in which to look for birthdays:
</para>
<programlisting>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9115 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 5 Dec |
