From: magnus.blaudd
Date: September 27 2011 11:53am
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3526 to 3527)
List-Archive: http://lists.mysql.com/commits/141161
Message-Id: <201109271154.p8RBs3dE024814@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3527 magnus.blaudd@stripped	2011-09-27
      Remove WARN_QUERY_PUSHED from errmsg-utf8.txt, it has been hardcoded until reserved in trunk

    modified:
      sql/share/errmsg-utf8.txt
 3526 magnus.blaudd@stripped	2011-09-27 [merge]
      Merge wl5881/5.5-cluster -> 5.5-cluster

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_glue.h
      sql/handler.cc
      sql/handler.h
      sql/lock.h
      sql/ndb_global_schema_lock.cc
      sql/ndb_global_schema_lock.h
      sql/sql_db.cc
      sql/sql_parse.cc
      sql/sql_rename.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/src/common/logger/FileLogHandler.cpp
      storage/ndb/src/common/util/File.cpp
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-08-31 10:39:08 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-09-27 11:50:55 +0000
@@ -6414,6 +6414,3 @@ ER_ERROR_IN_TRIGGER_BODY
 
 ER_ERROR_IN_UNKNOWN_TRIGGER_BODY
   eng "Unknown trigger has an error in its body: '%-.256s'"
-
-WARN_QUERY_NOT_PUSHED
-  eng "Table can't be part of pushed join" 

No bundle (reason: useless for push emails).