Commit 02625924 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441


sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
parents 897b7cbd 3f07afbe

sql/item_func.cc

+11 −8
Original line number Diff line number Diff line
@@ -1601,6 +1601,8 @@ longlong Item_func_bit_count::val_int() 
#ifdef HAVE_DLOPEN



udf_handler::~udf_handler()

{

  if (!not_original)

  {

    if (initialized)

    {
@@ -1615,6 +1617,7 @@ udf_handler::~udf_handler() 
    if (buffers)				// Because of bug in ecc

      delete [] buffers;

  }

}





bool

sql/item_sum.h

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ class Item_udf_sum : public Item_sum 
    :Item_sum( list ), udf(udf_arg)

  { quick_group=0;}

  Item_udf_sum(THD *thd, Item_udf_sum *item)

    :Item_sum(thd, item), udf(item->udf) {}

    :Item_sum(thd, item), udf(item->udf) { udf.not_original= TRUE; }

  const char *func_name() const { return udf.name(); }

  bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)

  {

sql/sql_udf.h

+2 −1
Original line number Diff line number Diff line
@@ -56,8 +56,9 @@ class udf_handler :public Sql_alloc 
 public:

  table_map used_tables_cache;

  bool const_item_cache;

  bool not_original;

  udf_handler(udf_func *udf_arg) :u_d(udf_arg), buffers(0), error(0),

    is_null(0), initialized(0)

    is_null(0), initialized(0), not_original(0)

  {}

  ~udf_handler();

  const char *name() const { return u_d ? u_d->name.str : "?"; }