bk commit into 5.0 tree (sergefp:1.1916)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1916 05/07/29 03:37:06 sergefp@stripped +3 -0
  Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it

  sql/item_func.h
    1.125 05/07/29 03:37:02 sergefp@stripped +1 -1
    Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it

  sql/ha_ndbcluster.h
    1.89 05/07/29 03:37:02 sergefp@stripped +0 -2
    Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it

  sql/ha_ndbcluster.cc
    1.195 05/07/29 03:37:02 sergefp@stripped +0 -30
    Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pslp.mylan
# Root:	/home/psergey/mysql-5.0-jul28-notlike

--- 1.124/sql/item_func.h	2005-07-26 10:14:28 +02:00
+++ 1.125/sql/item_func.h	2005-07-29 03:37:02 +02:00
@@ -43,7 +43,7 @@
   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,

--- 1.194/sql/ha_ndbcluster.cc	2005-07-21 09:35:01 +02:00
+++ 1.195/sql/ha_ndbcluster.cc	2005-07-29 03:37:02 +02:00
@@ -6568,17 +6568,6 @@
             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"));      
@@ -7165,25 +7154,6 @@
                           field->get_field_no(), value->get_val(), 
                           value->pack_length()));
       if (filter->cmp(NdbScanFilter::COND_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::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)

--- 1.88/sql/ha_ndbcluster.h	2005-07-06 11:26:33 +02:00
+++ 1.89/sql/ha_ndbcluster.h	2005-07-29 03:37:02 +02:00
@@ -103,8 +103,6 @@
   {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}