bk commit into 4.1 tree (guilhem:1.2469) BUG#12377

[guilhem]

Below is the list of changes that have just been committed into a local
4.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2469 05/11/10 14:58:53 guilhem@stripped +3 -0
  declaring some class members public for BUG#12377:
  "Item_date_add_interval needs to have the int_type member as Public".
  As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
  So please keep those members public.

  sql/item_timefunc.h
    1.55 05/11/10 14:58:43 guilhem@stripped +4 -4
    declaring some class members public for BUG#12377

  sql/item_strfunc.h
    1.98 05/11/10 14:58:43 guilhem@stripped +1 -1
    declaring some class members public for BUG#12377

  sql/item_func.h
    1.127 05/11/10 14:58:43 guilhem@stripped +2 -2
    declaring some class members public for BUG#12377

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-4.1

--- 1.126/sql/item_func.h	2005-07-26 09:51:02 +02:00
+++ 1.127/sql/item_func.h	2005-11-10 14:58:43 +01:00
@@ -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; // keep it public
   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; // keep it public
   Item_func_get_user_var(LEX_STRING a):
     Item_func(), name(a) {}
   double val();

--- 1.97/sql/item_strfunc.h	2005-10-21 11:38:58 +02:00
+++ 1.98/sql/item_strfunc.h	2005-11-10 14:58:43 +01:00
@@ -614,8 +614,8 @@
 
 class Item_func_conv_charset :public Item_str_func
 {
-  CHARSET_INFO *conv_charset;
 public:
+  CHARSET_INFO *conv_charset; // keep it public
   Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a)
   { conv_charset=cs; }
   String *val_str(String *);

--- 1.54/sql/item_timefunc.h	2005-11-01 11:59:53 +01:00
+++ 1.55/sql/item_timefunc.h	2005-11-10 14:58:43 +01:00
@@ -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; // keep it public
+  const bool date_sub_interval; // keep it public
   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; // keep it public
   Item_extract(interval_type type_arg, Item *a)
     :Item_int_func(a), int_type(type_arg) {}
   longlong val_int();
@@ -856,8 +856,8 @@
 
 class Item_func_get_format :public Item_str_func
 {
-  const timestamp_type type;
 public:
+  const timestamp_type type; // keep it public
   Item_func_get_format(timestamp_type type_arg, Item *a)
     :Item_str_func(a), type(type_arg)
   {}