bk commit into 4.1 tree (evgen:1.2483) BUG#19255

[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.2483 06/05/24 18:22:59 evgen@stripped +3 -0
  Fixed bug#19255: unchecked error results in server crash
  
  In multi-table delete a table for delete can't be used for selecting in
  subselects. Appropriate error was raised but wasn't checked which leads to a
  crash on execute phase.
  
  The mysql_execute_command() now checks for errors before executing select
  for multi-update.

  sql/sql_parse.cc
    1.481 06/05/24 18:20:40 evgen@stripped +2 -2
    Fixed bug#19225: unchecked error results in server crash
    The mysql_execute_command() now checks for errors before executing select
    for multi-update.

  mysql-test/r/multi_update.result
    1.44 06/05/24 18:18:52 evgen@stripped +5 -0
    Added test case for bug#19225: unchecked error results in server crash

  mysql-test/t/multi_update.test
    1.48 06/05/24 18:17:55 evgen@stripped +8 -0
    Added test case for bug#19225: unchecked error results in server crash

# 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/19225-bug-4.1-mysql

--- 1.480/sql/sql_parse.cc	2006-04-26 21:10:15 +04:00
+++ 1.481/sql/sql_parse.cc	2006-05-24 18:20:40 +04:00
@@ -3047,8 +3047,8 @@
       }
     }
 
-    if (!thd->is_fatal_error && (result= new multi_delete(thd,aux_tables,
-							  table_count)))
+    if (!res && !thd->is_fatal_error &&
+        (result= new multi_delete(thd,aux_tables, table_count)))
     {
       res= mysql_select(thd, &select_lex->ref_pointer_array,
 			select_lex->get_table_list(),

--- 1.43/mysql-test/r/multi_update.result	2004-12-11 16:35:48 +03:00
+++ 1.44/mysql-test/r/multi_update.result	2006-05-24 18:18:52 +04:00
@@ -475,3 +475,8 @@
 insert into t2 values(1,null);
 delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
 drop table t1, t2;
+create table t1(a int);
+create table t2(a int);
+delete from t1,t2 using t1,t2 where t1.a=(select a from t1);
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
+drop table t1, t2;

--- 1.47/mysql-test/t/multi_update.test	2005-07-28 04:21:44 +04:00
+++ 1.48/mysql-test/t/multi_update.test	2006-05-24 18:17:55 +04:00
@@ -448,4 +448,12 @@
 delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
 drop table t1, t2;
 
+#
+# Bug#19225: unchecked error leads to server crash
+#
+create table t1(a int);
+create table t2(a int);
+--error 1093
+delete from t1,t2 using t1,t2 where t1.a=(select a from t1);
+drop table t1, t2;
 # End of 4.1 tests