bk commit into 5.1 tree (svoj:1.2228)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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.2228 06/06/20 16:45:51 svoj@stripped +10 -0
  Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
  into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1

  mysql-test/t/myisam.test
    1.58 06/06/20 16:45:45 svoj@stripped +1 -1
    Manual merge.

  tests/mysql_client_test.c
    1.196 06/06/20 16:38:57 svoj@stripped +0 -0
    Auto merged

  sql/sql_update.cc
    1.193 06/06/20 16:38:57 svoj@stripped +0 -0
    Auto merged

  sql/sql_lex.cc
    1.188 06/06/20 16:38:57 svoj@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.561 06/06/20 16:38:56 svoj@stripped +0 -0
    Auto merged

  sql/item_func.cc
    1.302 06/06/20 16:38:56 svoj@stripped +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.81 06/06/20 16:38:56 svoj@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.126 06/06/20 16:38:56 svoj@stripped +0 -0
    Auto merged

  include/my_global.h
    1.137 06/06/20 16:38:56 svoj@stripped +0 -0
    Auto merged

  configure.in
    1.365 06/06/20 16:38:56 svoj@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:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/mysql/BUG18036/mysql-5.1/RESYNC

--- 1.192/sql/sql_update.cc	2006-06-04 23:05:17 +05:00
+++ 1.193/sql/sql_update.cc	2006-06-20 16:38:57 +05:00
@@ -985,7 +985,12 @@ reopen_tables:
       }
     }
   }
-
+  /*
+    Set exclude_from_table_unique_test value back to FALSE. It is needed for
+    further check in multi_update::prepare whether to use record cache.
+  */
+  lex->select_lex.exclude_from_table_unique_test= FALSE;
+ 
   if (thd->fill_derived_tables() &&
       mysql_handle_derived(lex, &mysql_derived_filling))
     DBUG_RETURN(TRUE);
@@ -1164,7 +1169,7 @@ int multi_update::prepare(List<Item> &no
   for (table_ref= leaves;  table_ref; table_ref= table_ref->next_leaf)
   {
     TABLE *table=table_ref->table;
-    if (!(tables_to_update & table->map) &&
+    if ((tables_to_update & table->map) &&
         unique_table(thd, table_ref, update_tables))
       table->no_cache= 1;			// Disable row cache
   }

--- 1.80/mysql-test/r/myisam.result	2006-05-09 01:05:21 +05:00
+++ 1.81/mysql-test/r/myisam.result	2006-06-20 16:38:56 +05:00
@@ -747,6 +747,14 @@ select count(id1) from t1 where id2 = 10
 count(id1)
 5
 drop table t1;
+CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=MyISAM;
+INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');
+UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';
+SELECT * FROM t1;
+a	b
+xxxxxxxxx	bbbbbb
+xxxxxxxxx	bbbbbb
+DROP TABLE t1;
 set storage_engine=MyISAM;
 drop table if exists t1,t2,t3;
 --- Testing varchar ---

--- 1.57/mysql-test/t/myisam.test	2006-05-09 01:05:26 +05:00
+++ 1.58/mysql-test/t/myisam.test	2006-06-20 16:45:45 +05:00
@@ -697,6 +697,15 @@ select count(*)   from t1 where id2 = 10
 select count(id1) from t1 where id2 = 10;
 drop table t1;
 
+#
+# BUG#18036 - update of table joined to self reports table as crashed
+#
+CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=MyISAM;
+INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');
+UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';
+SELECT * FROM t1;
+DROP TABLE t1;
+
 # End of 4.1 tests
 
 #
@@ -869,4 +878,3 @@ drop table t1;
 create table t1 (a int not null, key key_block_size=1024 (a));
 --error 1064
 create table t1 (a int not null, key `a` key_block_size=1024 (a));
-