Merge mysql.com:/home/pz/mysql/mysql-4.0-root

into mysql.com:/home/pz/mysql/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 23 insertions, 23 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 184a5e5fbe9..6c0c2cda06d 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -121,7 +121,7 @@ public:
   }
   bool is_null() { (void) val_int(); return null_value; }
   friend class udf_handler;
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -141,7 +141,7 @@ public:
     if (!t_arg) return result_field;
     return new Field_double(max_length, maybe_null, name,t_arg,decimals);
   }  
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_num_func :public Item_func
@@ -156,7 +156,7 @@ public:
   enum Item_result result_type () const { return hybrid_type; }
   void fix_length_and_dec() { fix_num_length_and_dec(); }
   bool is_null() { (void) val(); return null_value; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -190,7 +190,7 @@ class Item_num_op :public Item_func
       res= new Field_double(max_length, maybe_null, name, t_arg, decimals);
     return res;
   }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -483,7 +483,7 @@ public:
   const char *func_name() const { return truncate ? "truncate" : "round"; }
   double val();
   void fix_length_and_dec();
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -519,7 +519,7 @@ class Item_func_units :public Item_real_func
   double val();
   const char *func_name() const { return name; }
   void fix_length_and_dec() { decimals=NOT_FIXED_DEC; max_length=float_length(decimals); }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -536,7 +536,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   enum Item_result result_type () const { return cmp_type; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_min :public Item_func_min_max
@@ -562,7 +562,7 @@ public:
   longlong val_int();
   const char *func_name() const { return "length"; }
   void fix_length_and_dec() { max_length=10; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_bit_length :public Item_func_length
@@ -581,7 +581,7 @@ public:
   longlong val_int();
   const char *func_name() const { return "char_length"; }
   void fix_length_and_dec() { max_length=10; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_locate :public Item_int_func
@@ -593,7 +593,7 @@ public:
   const char *func_name() const { return "locate"; }
   longlong val_int();
   void fix_length_and_dec() { maybe_null=0; max_length=11; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -623,7 +623,7 @@ public:
     const_item_cache&=  item->const_item();
     with_sum_func= with_sum_func || item->with_sum_func;
   }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -635,7 +635,7 @@ public:
   longlong val_int();
   const char *func_name() const { return "ascii"; }
   void fix_length_and_dec() { max_length=3; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_ord :public Item_int_func
@@ -645,7 +645,7 @@ public:
   Item_func_ord(Item *a) :Item_int_func(a) {}
   longlong val_int();
   const char *func_name() const { return "ord"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_find_in_set :public Item_int_func
@@ -658,7 +658,7 @@ public:
   longlong val_int();
   const char *func_name() const { return "find_in_set"; }
   void fix_length_and_dec();
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -734,7 +734,7 @@ class Item_func_benchmark :public Item_int_func
   longlong val_int();
   const char *func_name() const { return "benchmark"; }
   void fix_length_and_dec() { max_length=1; maybe_null=0; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -759,7 +759,7 @@ public:
     return res;
   }
   Item_result result_type () const { return udf.result_type(); }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -868,7 +868,7 @@ class Item_func_get_lock :public Item_int_func
   longlong val_int();
   const char *func_name() const { return "get_lock"; }
   void fix_length_and_dec() { max_length=1; maybe_null=1;}
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_release_lock :public Item_int_func
@@ -879,7 +879,7 @@ class Item_func_release_lock :public Item_int_func
   longlong val_int();
   const char *func_name() const { return "release_lock"; }
   void fix_length_and_dec() { max_length=1; maybe_null=1;}
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 /* replication functions */
@@ -892,7 +892,7 @@ class Item_master_pos_wait :public Item_int_func
   longlong val_int();
   const char *func_name() const { return "master_pos_wait"; }
   void fix_length_and_dec() { max_length=1; maybe_null=1;}
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -918,7 +918,7 @@ public:
   void fix_length_and_dec();
   void print(String *str);
   const char *func_name() const { return "set_user_var"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -943,7 +943,7 @@ public:
   table_map used_tables() const
   { return const_var_flag ? 0 : RAND_TABLE_BIT; }
   bool eq(const Item *item, bool binary_cmp) const;
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -999,7 +999,7 @@ public:
 
   bool fix_index();
   void init_search(bool no_order);
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -1050,5 +1050,5 @@ public:
   longlong val_int();
   const char *func_name() const { return "check_lock"; }
   void fix_length_and_dec() { decimals=0; max_length=1; maybe_null=1;}
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };