OLAP functionality plus some small bug fixes

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index cc5902b4920..08fbfe25093 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -175,6 +175,7 @@ public:
   const char *func_name() const { return "weekday"; }
   enum Item_result result_type () const { return INT_RESULT; }
   void fix_length_and_dec() { decimals=0; max_length=1; maybe_null=1; }
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 class Item_func_dayname :public Item_func_weekday
@@ -200,6 +201,7 @@ public:
   {
     decimals=0; max_length=10;
   }
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -238,6 +240,7 @@ public:
     if (!t_arg) return result_field;
     return new Field_date(maybe_null, name, t_arg);
   }  
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -256,6 +259,7 @@ public:
     if (!t_arg) return result_field;
     return   new Field_datetime(maybe_null, name, t_arg);
   }  
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -283,6 +287,7 @@ public:
     if (!t_arg) return result_field;
     return   new Field_time(maybe_null, name, t_arg);
   }  
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -296,6 +301,7 @@ public:
   const char *func_name() const { return "curdate"; }
   void fix_length_and_dec();			/* Retrieves curtime */
   bool get_date(TIME *res,bool fuzzy_date);
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -317,6 +323,7 @@ public:
   const char *func_name() const { return "now"; }
   void fix_length_and_dec();
   bool get_date(TIME *res,bool fuzzy_date);
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -341,6 +348,7 @@ public:
   const char *func_name() const { return "date_format"; }
   void fix_length_and_dec();
   uint format_length(const String *format);
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 
@@ -400,6 +408,7 @@ public:
   double val() { return (double) val_int(); }
   longlong val_int();
   bool get_date(TIME *res,bool fuzzy_date);
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 class Item_extract :public Item_int_func
@@ -413,6 +422,7 @@ class Item_extract :public Item_int_func
   longlong val_int();
   const char *func_name() const { return "extract"; }
   void fix_length_and_dec();
+  virtual unsigned int size_of () { return sizeof(*this);}  
 };
 
 class Item_typecast :public Item_str_func