Commit 15205585 authored by unknown's avatar unknown

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_func.h:
  declaring some class members public for BUG#12377
sql/item_strfunc.h:
  declaring some class members public for BUG#12377
sql/item_timefunc.h:
  declaring some class members public for BUG#12377
parent bbe49b4e
...@@ -938,7 +938,6 @@ class user_var_entry; ...@@ -938,7 +938,6 @@ class user_var_entry;
class Item_func_set_user_var :public Item_func class Item_func_set_user_var :public Item_func
{ {
enum Item_result cached_result_type; enum Item_result cached_result_type;
LEX_STRING name;
user_var_entry *entry; user_var_entry *entry;
char buffer[MAX_FIELD_WIDTH]; char buffer[MAX_FIELD_WIDTH];
String value; String value;
...@@ -952,6 +951,7 @@ class Item_func_set_user_var :public Item_func ...@@ -952,6 +951,7 @@ class Item_func_set_user_var :public Item_func
public: public:
LEX_STRING name; // keep it public
Item_func_set_user_var(LEX_STRING a,Item *b) Item_func_set_user_var(LEX_STRING a,Item *b)
:Item_func(b), cached_result_type(INT_RESULT), name(a) :Item_func(b), cached_result_type(INT_RESULT), name(a)
{} {}
...@@ -972,10 +972,10 @@ class Item_func_set_user_var :public Item_func ...@@ -972,10 +972,10 @@ class Item_func_set_user_var :public Item_func
class Item_func_get_user_var :public Item_func class Item_func_get_user_var :public Item_func
{ {
LEX_STRING name;
user_var_entry *var_entry; user_var_entry *var_entry;
public: public:
LEX_STRING name; // keep it public
Item_func_get_user_var(LEX_STRING a): Item_func_get_user_var(LEX_STRING a):
Item_func(), name(a) {} Item_func(), name(a) {}
double val(); double val();
......
...@@ -614,8 +614,8 @@ class Item_func_quote :public Item_str_func ...@@ -614,8 +614,8 @@ class Item_func_quote :public Item_str_func
class Item_func_conv_charset :public Item_str_func class Item_func_conv_charset :public Item_str_func
{ {
CHARSET_INFO *conv_charset;
public: public:
CHARSET_INFO *conv_charset; // keep it public
Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a) Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a)
{ conv_charset=cs; } { conv_charset=cs; }
String *val_str(String *); String *val_str(String *);
......
...@@ -607,12 +607,12 @@ enum interval_type ...@@ -607,12 +607,12 @@ enum interval_type
class Item_date_add_interval :public Item_date_func class Item_date_add_interval :public Item_date_func
{ {
const interval_type int_type;
String value; String value;
const bool date_sub_interval;
enum_field_types cached_field_type; enum_field_types cached_field_type;
public: 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_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) {} :Item_date_func(a,b),int_type(type_arg), date_sub_interval(neg_arg) {}
String *val_str(String *); String *val_str(String *);
...@@ -628,10 +628,10 @@ class Item_date_add_interval :public Item_date_func ...@@ -628,10 +628,10 @@ class Item_date_add_interval :public Item_date_func
class Item_extract :public Item_int_func class Item_extract :public Item_int_func
{ {
const interval_type int_type;
String value; String value;
bool date_value; bool date_value;
public: public:
const interval_type int_type; // keep it public
Item_extract(interval_type type_arg, Item *a) Item_extract(interval_type type_arg, Item *a)
:Item_int_func(a), int_type(type_arg) {} :Item_int_func(a), int_type(type_arg) {}
longlong val_int(); longlong val_int();
...@@ -856,8 +856,8 @@ enum date_time_format ...@@ -856,8 +856,8 @@ enum date_time_format
class Item_func_get_format :public Item_str_func class Item_func_get_format :public Item_str_func
{ {
const timestamp_type type;
public: public:
const timestamp_type type; // keep it public
Item_func_get_format(timestamp_type type_arg, Item *a) Item_func_get_format(timestamp_type type_arg, Item *a)
:Item_str_func(a), type(type_arg) :Item_str_func(a), type(type_arg)
{} {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment