bzr push into mysql-trunk branch (magnus.blaudd:3960 to 3961)

[magnus.blaudd]

 3961 magnus.blaudd@stripped	2012-06-05 [merge]
      Merge trunk-bug13604447 -> trunk

    modified:
      sql/ha_ndbcluster_cond.cc
      sql/item_cmpfunc.h
 3960 Tor Didriksen	2012-06-05 [merge]
      null merge 5.5 => trunk

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2011-09-30 10:24:10 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2012-06-01 17:27:57 +0000
@@ -497,6 +497,13 @@ ndb_serialize_cond(const Item *item, voi
           {
             Ndb_expect_stack* expect_next= new Ndb_expect_stack();
             DBUG_PRINT("info", ("LIKE_FUNC"));      
+
+            if (((const Item_func_like *)func_item)->escape_was_used_in_parsing())
+            {
+              DBUG_PRINT("info", ("LIKE expressions with ESCAPE not supported"));
+              context->supported= FALSE;
+            }
+            
             curr_cond->ndb_item= new Ndb_item(func_item->functype(),
                                               func_item);      
 

=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h	2012-05-23 15:13:27 +0000
+++ b/sql/item_cmpfunc.h	2012-06-01 17:27:57 +0000
@@ -1588,6 +1588,11 @@ public:
   const char *func_name() const { return "like"; }
   bool fix_fields(THD *thd, Item **ref);
   void cleanup();
+  /**
+    @retval true non default escape char specified
+                 using "expr LIKE pat ESCAPE 'escape_char'" syntax
+  */
+  bool escape_was_used_in_parsing() const { return escape_used_in_parsing; }
 };
 
 

No bundle (reason: useless for push emails).