From: Ole John Aske
Date: September 27 2011 11:53am
Subject: bzr push into mysql-trunk branch (ole.john.aske:3458 to 3459)
List-Archive: http://lists.mysql.com/commits/141160
Message-Id: <20110927115356.F3E36230@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3459 Ole John Aske	2011-09-27
      Add definition of WARN_QUERY_NOT_PUSHED such that it is reserved for future usage 
      by any SEs which may implement 'pushed join'

    modified:
      sql/share/errmsg-utf8.txt
 3458 Ole John Aske	2011-09-12
      Change classes in 'namespace AQP' to inherit from 'class Sql_alloc'
      such that the builtin mysql memory allocators are used to allocate
      these objects.

    modified:
      sql/abstract_query_plan.h
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-09-01 18:59:44 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-09-27 11:53:34 +0000
@@ -6526,3 +6526,6 @@ ER_MTS_INCONSISTENT_DATA
 
 ER_UNDO_RECORD_TOO_BIG
   eng "Undo log record is too big."
+
+WARN_QUERY_NOT_PUSHED
+  eng "Table can't be part of pushed join" 

No bundle (reason: useless for push emails).