Re: [Maria-developers] [Commits] Rev 2953: Mess in types fixed. in file:///home/bell/maria/bzr/work-maria-5.1-itemtype-bugs2/

...

...

...

...

"sanja" == sanja writes:

sanja> At file:///home/bell/maria/bzr/work-maria-5.1-itemtype-bugs2/ sanja> ------------------------------------------------------------ sanja> revno: 2953 sanja> revision-id: sanja@askmonty.org-20101019101449-g36e3lwnqy7qbmos sanja> parent: igor@askmonty.org-20101014214738-zvj7tbol145ohz2z sanja> committer: sanja@askmonty.org sanja> branch nick: work-maria-5.1-itemtype-bugs2 sanja> timestamp: Tue 2010-10-19 13:14:49 +0300 sanja> message: sanja> Mess in types fixed.

=== modified file 'sql/item.h' --- a/sql/item.h 2010-09-21 04:22:00 +0000 +++ b/sql/item.h 2010-10-19 10:14:49 +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 */

ok. (I assume this is only for Item_insert_value::eq()). Regards, Monty