Author: paul
Date: 2006-06-05 22:15:44 +0200 (Mon, 05 Jun 2006)
New Revision: 2280
Log:
r10280@polar: paul | 2006-06-05 14:08:28 -0500
Don't imply that NOW()/RAND() are deterministic just because they
might be replication-safe.
Modified:
trunk/
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.1/stored-procedures.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10279
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10980
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10280
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10980
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2006-06-05 20:15:04 UTC (rev 2279)
+++ trunk/refman-5.0/stored-procedures.xml 2006-06-05 20:15:44 UTC (rev 2280)
@@ -411,9 +411,9 @@
</para>
<para>
- For replication purposes, use of the <literal>NOW()</literal>
- function (or its synonyms) or <literal>RAND()</literal> does not
- necessarily make a routine non-deterministic. For
+ A routine that contains the <literal>NOW()</literal> function
+ (or its synonyms) or <literal>RAND()</literal> is
+ non-deterministic, but it might still be replication-safe. For
<literal>NOW()</literal>, the binary log includes the timestamp
and replicates correctly. <literal>RAND()</literal> also
replicates correctly as long as it is invoked only once within a
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2006-06-05 20:15:04 UTC (rev 2279)
+++ trunk/refman-5.1/stored-procedures.xml 2006-06-05 20:15:44 UTC (rev 2280)
@@ -402,9 +402,9 @@
</para>
<para>
- For replication purposes, use of the <literal>NOW()</literal>
- function (or its synonyms) or <literal>RAND()</literal> does not
- necessarily make a routine non-deterministic. For
+ A routine that contains the <literal>NOW()</literal> function
+ (or its synonyms) or <literal>RAND()</literal> is
+ non-deterministic, but it might still be replication-safe. For
<literal>NOW()</literal>, the binary log includes the timestamp
and replicates correctly. <literal>RAND()</literal> also
replicates correctly as long as it is invoked only once within a
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2280 - in trunk: . refman-5.0 refman-5.1 | paul | 5 Jun |
