bzr commit into mysql-5.1-bugteam branch (zhenxing.he:2894) Bug#42415

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b42415/5.1-bugteam/ based on revid:joro@strippeddvtqpqgnj3yc

 2894 He Zhenxing	2009-05-20
      BUG#42415 UPDATE with LIMIT clause unsafe for statement format even when ORDER BY PK
      
      Change the warning message to 'Statement may not be safe to log in
      statement format' to indicate that the decision on whether a
      statement is safe or not is heuristic, and we are conservative.

    M  sql/share/errmsg.txt
=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-04-14 14:19:15 +0000
+++ b/sql/share/errmsg.txt	2009-05-20 08:24:22 +0000
@@ -6076,7 +6076,7 @@ ER_SLAVE_INCIDENT
 ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT
         eng "Table has no partition for some existing values"
 ER_BINLOG_UNSAFE_STATEMENT
-        eng "Statement is not safe to log in statement format."
+        eng "Statement may not be safe to log in statement format."
         swe "Detta �inte s�rt att logga i statement-format."
 ER_SLAVE_FATAL_ERROR
         eng "Fatal error: %s"

Attachment: [text/bzr-bundle] bzr/[e-mail]