bk commit into 5.0 tree (evgen:1.1941)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 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.1941 05/07/18 19:37:42 evgen@stripped +3 -0
  Merge moonbone.local:/work/mysql-4.1-bug-11868
  into moonbone.local:/work/mysql-5.0-bug-11482

  sql/sql_select.cc
    1.338 05/07/18 19:37:41 evgen@stripped +0 -0
    Auto merged

  mysql-test/t/update.test
    1.21 05/07/18 19:37:41 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/update.result
    1.24 05/07/18 19:37:41 evgen@stripped +0 -0
    Auto merged

# 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/mysql-5.0-bug-11482/RESYNC

--- 1.337/sql/sql_select.cc	2005-07-18 18:30:37 +04:00
+++ 1.338/sql/sql_select.cc	2005-07-18 19:37:41 +04:00
@@ -5185,7 +5185,12 @@
           DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
           Item_field *not_null_item= (Item_field*)item;
           JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
-          if (referred_tab->join != join)
+          /*
+            For UPDATE queries such as:
+            UPDATE t1 SET t1.f2=(SELECT MAX(t2.f4) FROM t2 WHERE t2.f3=t1.f1);
+            not_null_item is the t1.f1, but it's referred_tab is 0.
+          */
+          if (!referred_tab || referred_tab->join != join)
             continue;
           Item *notnull;
           if (!(notnull= new Item_func_isnotnull(not_null_item)))

--- 1.23/mysql-test/r/update.result	2005-06-20 14:08:55 +04:00
+++ 1.24/mysql-test/r/update.result	2005-07-18 19:37:41 +04:00
@@ -240,3 +240,14 @@
 show warnings;
 Level	Code	Message
 drop table t1, t2;
+create table t1(f1 int, f2 int);
+create table t2(f3 int, f4 int);
+create index idx on t2(f3);
+insert into t1 values(1,0),(2,0);
+insert into t2 values(1,1),(2,2);
+UPDATE t1 SET t1.f2=(SELECT MAX(t2.f4) FROM t2 WHERE t2.f3=t1.f1);
+select * from t1;
+f1	f2
+1	1
+2	2
+drop table t1,t2;

--- 1.20/mysql-test/t/update.test	2005-06-20 14:08:55 +04:00
+++ 1.21/mysql-test/t/update.test	2005-07-18 19:37:41 +04:00
@@ -201,3 +201,16 @@
 update t1, t2 set t1.a = t2.a where t2.b = t1.b;
 show warnings;
 drop table t1, t2;
+
+#
+# Bug #11868 Update with subquery with ref built with a key from the updated
+#            table crashes server
+#
+create table t1(f1 int, f2 int);
+create table t2(f3 int, f4 int);
+create index idx on t2(f3);
+insert into t1 values(1,0),(2,0);
+insert into t2 values(1,1),(2,2);
+UPDATE t1 SET t1.f2=(SELECT MAX(t2.f4) FROM t2 WHERE t2.f3=t1.f1);
+select * from t1;
+drop table t1,t2;