Commit 93607e35 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mysql_src/mysql-4.1-gca 

into  mysql.com:/home/mysql_src/mysql-5.0-release


sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
parents 50ab7648 6e56f7e0

sql/item_func.h

+2 −2
Original line number Diff line number Diff line
@@ -1129,7 +1129,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;
@@ -1146,6 +1145,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)

  {}
@@ -1168,10 +1168,10 @@ class Item_func_set_user_var :public Item_func 


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) {}

  enum Functype functype() const { return GUSERVAR_FUNC; }

sql/item_strfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -651,8 +651,8 @@ class Item_func_quote :public Item_str_func 


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 *);

sql/item_timefunc.h

+4 −4
Original line number Diff line number Diff line
@@ -641,12 +641,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 *);
@@ -662,10 +662,10 @@ class Item_date_add_interval :public Item_date_func 


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();
@@ -910,8 +910,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)

  {}