Commit 53043f53 authored by unknown's avatar unknown
Browse files

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
parents c1a3b5be 8c129f50

mysql-test/r/insert_select.result

+10 −0
Original line number Diff line number Diff line
@@ -668,3 +668,13 @@ ERROR 42S02: Unknown table 't2' in field list 
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;

ERROR 42S02: Unknown table 't2' in field list

drop table t1,t2,t3;

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

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

select * from t1;

f1

2000

2001

2002

drop table t1;

mysql-test/t/insert_select.test

+10 −0
Original line number Diff line number Diff line
@@ -204,4 +204,14 @@ insert into t1 select t2.a from t2 on duplicate key update t2.a= a + t2.b; 
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;

drop table t1,t2,t3;



#

# Bug #12695 Item_func_isnull::update_used_tables() did not update 

#            const_item_cache

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

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

select * from t1;

drop table t1;



# End of 4.1 tests