bk commit into 4.0 tree (1.1560)

[Sinisa]

Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1560 03/02/08 19:25:19 Sinisa@stripped +4 -0
  A fix for non-releasing locks for multi table updates and multi
  table deletes with InnoDB tables.

  sql/sql_update.cc
    1.76 03/02/08 19:25:16 Sinisa@stripped +1 -1
    A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables.

  sql/sql_parse.cc
    1.294 03/02/08 19:25:16 Sinisa@stripped +1 -1
    A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables.

  mysql-test/t/innodb.test
    1.29 03/02/08 19:25:16 Sinisa@stripped +6 -0
    A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables.

  mysql-test/r/innodb.result
    1.51 03/02/08 19:25:16 Sinisa@stripped +6 -0
    A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables.

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.293/sql/sql_parse.cc	Wed Jan 29 21:33:54 2003
+++ 1.294/sql/sql_parse.cc	Sat Feb  8 19:25:16 2003
@@ -2038,7 +2038,7 @@
 		       (ORDER *)NULL,(ORDER *)NULL,(Item *)NULL,
 		       (ORDER *)NULL,
 		       select_lex->options | thd->options |
-		       SELECT_NO_JOIN_CACHE,
+		       SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK,
 		       result);
       delete result;
     }

--- 1.75/sql/sql_update.cc	Tue Feb  4 19:42:12 2003
+++ 1.76/sql/sql_update.cc	Sat Feb  8 19:25:16 2003
@@ -401,7 +401,7 @@
   res= mysql_select(thd,table_list,total_list,
 		    conds, (ORDER *) NULL, (ORDER *)NULL, (Item *) NULL,
 		    (ORDER *)NULL,
-		    options | SELECT_NO_JOIN_CACHE,
+		    options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK,
 		    result);
   delete result;
   DBUG_RETURN(res);

--- 1.50/mysql-test/r/innodb.result	Tue Dec  3 13:08:21 2002
+++ 1.51/mysql-test/r/innodb.result	Sat Feb  8 19:25:16 2003
@@ -1058,3 +1058,9 @@
 select t1.a from t1,t2 where t1.a=t2.b;
 a
 drop table t1,t2;
+create table t1 (a int not null, b int, primary key (a)) type = innodb;
+create table t2 (a int not null, b int, primary key (a)) type = innodb;
+insert into t1 values (10, 20);
+insert into t2 values (10, 20);
+update t1, t2 set t1.b = 150, t2.b = t1.b where t2.a = t1.a and t1.a = 10;
+drop table t1,t2;

--- 1.28/mysql-test/t/innodb.test	Tue Dec  3 13:08:21 2002
+++ 1.29/mysql-test/t/innodb.test	Sat Feb  8 19:25:16 2003
@@ -696,3 +696,9 @@
 create table t2 (b varchar(10) not null unique) type=innodb;
 select t1.a from t1,t2 where t1.a=t2.b;
 drop table t1,t2;
+create table t1 (a int not null, b int, primary key (a)) type = innodb;
+create table t2 (a int not null, b int, primary key (a)) type = innodb;
+insert into t1 values (10, 20);
+insert into t2 values (10, 20);
+update t1, t2 set t1.b = 150, t2.b = t1.b where t2.a = t1.a and t1.a = 10;
+drop table t1,t2;