bk commit into 4.1 tree (evgen:1.2394) BUG#12695

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2394 05/09/10 02:30:26 evgen@stripped +2 -0
  insert_select.result, insert_select.test:
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

  mysql-test/r/insert_select.result
    1.28 05/09/10 02:29:28 evgen@stripped +10 -0
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

  mysql-test/t/insert_select.test
    1.22 05/09/10 02:27:33 evgen@stripped +10 -0
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/12695-bug-4.1-mysql

--- 1.27/mysql-test/r/insert_select.result	2005-06-27 17:46:33 +04:00
+++ 1.28/mysql-test/r/insert_select.result	2005-09-10 02:29:28 +04:00
@@ -668,3 +668,13 @@
 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;

--- 1.21/mysql-test/t/insert_select.test	2005-07-28 04:21:43 +04:00
+++ 1.22/mysql-test/t/insert_select.test	2005-09-10 02:27:33 +04:00
@@ -204,4 +204,14 @@
 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