aliases with multi-table updates / deletes

fix for a bug with derived tables and query cache
ix for a charset bug in timestamp


mysql-test/r/multi_update.result:
  aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
  fix for query cache with derived tables
mysql-test/t/multi_update.test:
  aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
  Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
  fix for a bug with derived tables and query cache
sql/field.cc:
  fix for a charset bug in timestamp
sql/sql_parse.cc:
  aliases with multi-table updates / deletes
sql/sql_yacc.yy:
  aliases with multi-table updates / deletes

1 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test
index c126d221bd2..3d524cb35a2 100644
--- a/mysql-test/t/outfile.test
+++ b/mysql-test/t/outfile.test
@@ -21,3 +21,8 @@
 #select * into dumpfile "/tmp/select-test.99" from t1;
 #select load_file("/tmp/select-test.not-exist");
 #drop table t1;
+#drop table if exists t;
+#CREATE TABLE t (  t timestamp NOT NULL,  c char(200) character set latin1 NOT NULL default '',  KEY t (t)) TYPE=MyISAM;
+#INSERT INTO t VALUES ('2002-12-20 12:01:20','');
+#select * from t into outfile "fdg";
+#drop table if exists t;