merge 5.1->5.2

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 22934ad684e..de3e01e06a9 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -744,6 +744,7 @@ public:
   {
     return master_unit()->return_after_parsing();
   }
+  inline bool is_subquery_function() { return master_unit()->item != 0; }
 
   void mark_as_dependent(st_select_lex *last, Item *dependency);
 
@@ -1740,6 +1741,7 @@ typedef struct st_lex : public Query_tables_list
       - CREATE TRIGGER (points to "TRIGGER");
       - CREATE PROCEDURE (points to "PROCEDURE");
       - CREATE FUNCTION (points to "FUNCTION" or "AGGREGATE");
+      - CREATE EVENT (points to "EVENT")
 
     This pointer is required to add possibly omitted DEFINER-clause to the
     DDL-statement before dumping it to the binlog.