diff -uNr mysql-4.1.14-pristine/sql/item_func.h mysql-4.1.14-myparse/sql/item_func.h
--- mysql-4.1.14-pristine/sql/item_func.h       2005-08-17 13:06:29.000000000 -0400
+++ mysql-4.1.14-myparse/sql/item_func.h        2005-10-03 09:46:15.000000000 -0400
@@ -938,7 +938,6 @@
 class Item_func_set_user_var :public Item_func
 {
   enum Item_result cached_result_type;
-  LEX_STRING name;
   user_var_entry *entry;
   char buffer[MAX_FIELD_WIDTH];
   String value;
@@ -952,6 +951,7 @@


 public:
+  LEX_STRING name;
   Item_func_set_user_var(LEX_STRING a,Item *b)
     :Item_func(b), cached_result_type(INT_RESULT), name(a)
   {}
@@ -972,10 +972,10 @@

 class Item_func_get_user_var :public Item_func
 {
-  LEX_STRING name;
   user_var_entry *var_entry;

 public:
+  LEX_STRING name;
   Item_func_get_user_var(LEX_STRING a):
     Item_func(), name(a) {}
   double val();
diff -uNr mysql-4.1.14-pristine/sql/item_strfunc.h mysql-4.1.14-myparse/sql/item_strfunc.h
--- mysql-4.1.14-pristine/sql/item_strfunc.h    2005-08-17 13:06:30.000000000 -0400
+++ mysql-4.1.14-myparse/sql/item_strfunc.h     2005-10-03 09:43:14.000000000 -0400
@@ -611,8 +611,8 @@

 class Item_func_conv_charset :public Item_str_func
 {
-  CHARSET_INFO *conv_charset;
 public:
+  CHARSET_INFO *conv_charset;
   Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a)
   { conv_charset=cs; }
   String *val_str(String *);
diff -uNr mysql-4.1.14-pristine/sql/item_timefunc.h mysql-4.1.14-myparse/sql/item_timefunc.h
--- mysql-4.1.14-pristine/sql/item_timefunc.h   2005-08-17 13:06:33.000000000 -0400
+++ mysql-4.1.14-myparse/sql/item_timefunc.h    2005-10-03 09:37:18.000000000 -0400
@@ -607,12 +607,12 @@

 class Item_date_add_interval :public Item_date_func
 {
-  const interval_type int_type;
   String value;
-  const bool date_sub_interval;
   enum_field_types cached_field_type;

 public:
+  const interval_type int_type;
+  const bool date_sub_interval;
   Item_date_add_interval(Item *a,Item *b,interval_type type_arg,bool neg_arg)
     :Item_date_func(a,b),int_type(type_arg), date_sub_interval(neg_arg) {}
   String *val_str(String *);
@@ -628,10 +628,10 @@

 class Item_extract :public Item_int_func
 {
-  const interval_type int_type;
   String value;
   bool date_value;
  public:
+  const interval_type int_type;
   Item_extract(interval_type type_arg, Item *a)
     :Item_int_func(a), int_type(type_arg) {}
   longlong val_int();
@@ -855,8 +855,8 @@

 class Item_func_get_format :public Item_str_func
 {
-  const timestamp_type type;
 public:
+  const timestamp_type type;
   Item_func_get_format(timestamp_type type_arg, Item *a)
     :Item_str_func(a), type(type_arg)
   {}