maria-developers team mailing list archive

[sanja@xxxxxxxxxxxx]

#At lp:maria

 2689 sanja@xxxxxxxxxxxx	2009-03-25
      Bugs found after Item types check fixed.
      modified:
        sql/item.h

per-file messages:
  sql/item.h
    Unused VIEW_FIXER_ITEM removed (appeared as result of fix with then was redone).
    Item_insert_value::type() (which checked in Item_insert_value::eq() but was skipped in original patch) added.
=== modified file 'sql/item.h'
--- a/sql/item.h	2009-02-19 09:01:25 +0000
+++ b/sql/item.h	2009-03-25 10:04:29 +0000
@@ -481,8 +481,7 @@ public:
 	     FIELD_VARIANCE_ITEM, INSERT_VALUE_ITEM,
              SUBSELECT_ITEM, ROW_ITEM, CACHE_ITEM, TYPE_HOLDER,
              PARAM_ITEM, TRIGGER_FIELD_ITEM, DECIMAL_ITEM,
-             XPATH_NODESET, XPATH_NODESET_CMP,
-             VIEW_FIXER_ITEM};
+             XPATH_NODESET, XPATH_NODESET_CMP};
 
   enum cond_result { COND_UNDEF,COND_OK,COND_TRUE,COND_FALSE };
 
@@ -2603,7 +2602,8 @@ public:
   {
     return Item_field::save_in_field(field_arg, no_conversions);
   }
-  /* 
+  enum Type type() const { return INSERT_VALUE_ITEM; }
+  /*
    We use RAND_TABLE_BIT to prevent Item_insert_value from
    being treated as a constant and precalculated before execution
   */