mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -938,7 +938,6 @@ class user_var_entry;
|
||||
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 @@ class Item_func_set_user_var :public Item_func
|
||||
|
||||
|
||||
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 @@ public:
|
||||
|
||||
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();
|
||||
|
@ -614,8 +614,8 @@ public:
|
||||
|
||||
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 *);
|
||||
|
@ -607,12 +607,12 @@ enum interval_type
|
||||
|
||||
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 @@ public:
|
||||
|
||||
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 @@ enum date_time_format
|
||||
|
||||
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)
|
||||
{}
|
||||
|
Reference in New Issue
Block a user