[Commits] Rev 2972: Fixed mess in the types. in file:///home/bell/maria/bzr/work-maria-5.1-itemtype-bugs/

sanja at askmonty.org sanja at askmonty.org
Tue Nov 16 12:32:37 EET 2010


At file:///home/bell/maria/bzr/work-maria-5.1-itemtype-bugs/

------------------------------------------------------------
revno: 2972
revision-id: sanja at askmonty.org-20101116103236-tp4b7wqfkhoi57nv
parent: monty at askmonty.org-20101115204441-dv0b6txumsm0g1w1
committer: sanja at askmonty.org
branch nick: work-maria-5.1-itemtype-bugs
timestamp: Tue 2010-11-16 12:32:36 +0200
message:
  Fixed mess in the types.
-------------- next part --------------
=== modified file 'sql/item.h'
--- a/sql/item.h	2010-09-21 04:22:00 +0000
+++ b/sql/item.h	2010-11-16 10:32:36 +0000
@@ -488,8 +488,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 };
 
@@ -2908,7 +2907,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
   */



More information about the commits mailing list