bzr push into mysql-trunk branch (jon.hauglid:3955 to 3956)

[Jon Olav Hauglid]

 3956 Jon Olav Hauglid	2012-07-03
      Add "End of 5.7 error messages" marker to errmsg-utf8.txt
      Move newly added 5.7 only error messages below 
      "End of 5.6 error messages." marker.

    modified:
      sql/share/errmsg-utf8.txt
 3955 Mayank Prasad	2012-07-03 [merge]
      Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED
             
       test case change merge 5.6->trunk

    modified:
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/t/query_cache.test
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2012-06-28 11:26:38 +0000
+++ b/sql/share/errmsg-utf8.txt	2012-07-03 06:37:26 +0000
@@ -6919,6 +6919,10 @@ ER_FK_COLUMN_NOT_NULL
         eng "Column '%-.192s' cannot be NOT NULL: needed in a foreign key constraint '%-.192s' SET NULL"
         ger "Spalte '%-.192s' kann nicht NOT NULL sein: wird für eine Fremdschlüsselbeschränkung '%-.192s' SET NULL benötigt"
 
+#
+#  End of 5.6 error messages.
+#
+
 ER_FILE_CORRUPT
   eng "File %s is corrupted"
 
@@ -6929,5 +6933,5 @@ ER_INCONSISTENT_ERROR
   eng "Query caused different errors on master and slave. Error on master: message (format)='%s' error code=%d; Error on slave:actual message='%s', error code=%d. Default database:'%s'. Query:'%s'"
 
 #
-#  End of 5.6 error messages.
+#  End of 5.7 error messages.
 #

No bundle (reason: useless for push emails).