Many fixes.

I still have to make a test case for :

UPDATE from sub-select with derived table


mysql-test/r/multi_update.result:
  Test for found rows in multi-table update
mysql-test/r/subselect.result:
  Fix for new syntax for UNION's
mysql-test/t/multi_update.test:
  Test for found rows in multi-table update
mysql-test/t/subselect.test:
  Fix for new syntax for UNION's
sql/sql_cache.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_derived.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_parse.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_show.cc:
  Fix for th eshow of replication status
sql/sql_yacc.yy:
  Three fixes.
  
  One for not allowing mixing of braces and non-braces in UNION's
  
  Second one for table aliases in multi-table deletes / updates
  
  Third one for using derived tables within sub-selects for 
  UPDATE / DELETE commands

1 files changed, 2 insertions, 7 deletions

diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index f7d845e9e36..54179a5e25c 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -168,14 +168,9 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
 	      tables->table_list->table=tables->table; // to fix a problem in EXPLAIN
 	  }
 	  else
-	  {
-	    if (is_union)
-	      unit->exclude();
-	    else
-	      sl->exclude();
-	  }
+	    unit->exclude();
 	  t->db=(char *)"";
-	  t->derived=(SELECT_LEX *)0; // just in case ...
+	  t->derived=(SELECT_LEX *)1; // just in case ...
 	  table->file->info(HA_STATUS_VARIABLE);
 	}
       }