Commit 3c2bdb59 authored by unknown's avatar unknown
Browse files

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

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
parents 5392be95 17870724

sql/item_func.h

+4 −1
Original line number Diff line number Diff line
@@ -138,7 +138,10 @@ class Item_func :public Item_result_field 
  {

    return (null_value=args[0]->get_time(ltime));

  }

  bool is_null() { (void) val_int(); return null_value; }

  bool is_null() { 

    (void) val_int();  /* Discard result. It sets null_value as side-effect. */ 

    return null_value; 

  }

  friend class udf_handler;

  Field *tmp_table_field() { return result_field; }

  Field *tmp_table_field(TABLE *t_arg);

sql/sql_base.cc

+5 −3
Original line number Diff line number Diff line
@@ -499,8 +499,10 @@ void close_temporary_tables(THD *thd) 


  if (!mysql_bin_log.is_open())

  {

    for (table= thd->temporary_tables; table; table= table->next)

    TABLE *next;

    for (table= thd->temporary_tables; table; table= next)

    {

      next= table->next;

      close_temporary(table, 1);

    }

    thd->temporary_tables= 0;