Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/my/mysql-5.0

sql/ha_ndbcluster.cc

@@ -6568,17 +6568,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
             context->expect(Item::FUNC_ITEM);
             break;
           }
-          case Item_func::NOTLIKE_FUNC:
-          {
-            DBUG_PRINT("info", ("NOTLIKE_FUNC"));      
-            curr_cond->ndb_item= new Ndb_item(func_item->functype(),
-                                              func_item);      
-            context->expect(Item::STRING_ITEM);
-            context->expect(Item::FIELD_ITEM);
-            context->expect_field_result(STRING_RESULT);
-            context->expect(Item::FUNC_ITEM);
-            break;
-          }
           case Item_func::ISNULL_FUNC:
           {
             DBUG_PRINT("info", ("ISNULL_FUNC"));      
@@ -7172,25 +7161,6 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
       cond= cond->next->next->next;
       DBUG_RETURN(0);
     }
-    case Item_func::NOTLIKE_FUNC:
-    {
-      if (!value || !field) break;
-      if ((value->qualification.value_type != Item::STRING_ITEM) &&
-          (value->qualification.value_type != Item::VARBIN_ITEM))
-        break;
-      // Save value in right format for the field type
-      value->save_in_field(field);
-      DBUG_PRINT("info", ("Generating NOTLIKE filter: notlike(%d,%s,%d)", 
-                          field->get_field_no(), value->get_val(), 
-                          value->pack_length()));
-      if (filter->cmp(NdbScanFilter::COND_NOT_LIKE, 
-                      field->get_field_no(),
-                      value->get_val(),
-                      value->pack_length()) == -1)
-        DBUG_RETURN(1);
-      cond= cond->next->next->next;
-      DBUG_RETURN(0);
-    }
     case Item_func::ISNULL_FUNC:
       if (!field)
         break;

sql/ha_ndbcluster.h

@@ -103,8 +103,6 @@ static const negated_function_mapping neg_map[]=
   {Item_func::LE_FUNC, Item_func::GT_FUNC},
   {Item_func::GT_FUNC, Item_func::LE_FUNC},
   {Item_func::GE_FUNC, Item_func::LT_FUNC},
-  {Item_func::LIKE_FUNC, Item_func::NOTLIKE_FUNC},
-  {Item_func::NOTLIKE_FUNC, Item_func::LIKE_FUNC},
   {Item_func::ISNULL_FUNC, Item_func::ISNOTNULL_FUNC},
   {Item_func::ISNOTNULL_FUNC, Item_func::ISNULL_FUNC},
   {Item_func::UNKNOWN_FUNC, Item_func::NOT_FUNC}

sql/item_func.h

@@ -43,7 +43,7 @@ class Item_func :public Item_result_field
   bool const_item_cache;
   enum Functype { UNKNOWN_FUNC,EQ_FUNC,EQUAL_FUNC,NE_FUNC,LT_FUNC,LE_FUNC,
 		  GE_FUNC,GT_FUNC,FT_FUNC,
-		  LIKE_FUNC,NOTLIKE_FUNC,ISNULL_FUNC,ISNOTNULL_FUNC,
+		  LIKE_FUNC,ISNULL_FUNC,ISNOTNULL_FUNC,
 		  COND_AND_FUNC, COND_OR_FUNC, COND_XOR_FUNC,
                   BETWEEN, IN_FUNC, MULT_EQUAL_FUNC,
 		  INTERVAL_FUNC, ISNOTNULLTEST_FUNC,