Commit 213fa9cb authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 17ec83fc 5a49a632

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -764,3 +764,12 @@ select date(left(f1+0,8)) from t1 group by 1; 
date(left(f1+0,8))

2005-06-06

drop table t1;

create table t1(f1 varchar(5) key);

insert into t1 values (1),(2);

select sql_buffer_result max(f1) is null from t1;

max(f1) is null

0

select sql_buffer_result max(f1)+1 from t1;

max(f1)+1

3

drop table t1;

mysql-test/t/group_by.test

+10 −0
Original line number Diff line number Diff line
@@ -600,4 +600,14 @@ insert into t1 values('2005-06-06'); 
select date(left(f1+0,8)) from t1 group by 1;

drop table t1;



#

# BUG#12695: Item_func_isnull::update_used_tables

# did not update const_item_cache

#

create table t1(f1 varchar(5) key);

insert into t1 values (1),(2);

select sql_buffer_result max(f1) is null from t1;

select sql_buffer_result max(f1)+1 from t1;

drop table t1;



# End of 4.1 tests

sql/item_cmpfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ class Item_func_isnull :public Item_bool_func 
    else

    {

      args[0]->update_used_tables();

      if (!(used_tables_cache=args[0]->used_tables()))

      if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())))

      {

	/* Remember if the value is always NULL or never NULL */

	cached_value= (longlong) args[0]->is_null();