summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-12-28 21:34:17 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-12-28 21:34:17 +0200
commit84a9a9fe5bc7583905672c0b94011cfa1606b08d (patch)
tree5297180578ae74db613ac34609d154992d7192eb /mysql-test/t
parentdcf6470f3100bbe7d7d78a47956b6713b0532af3 (diff)
downloadmariadb-git-84a9a9fe5bc7583905672c0b94011cfa1606b08d.tar.gz
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
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/multi_update.test2
-rw-r--r--mysql-test/t/outfile.test5
-rw-r--r--mysql-test/t/query_cache.test1
3 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 4e0622d14bb..28780ab4ed0 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -213,7 +213,7 @@ insert into t2 values(1,10),(1,20);
UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
select * from t1;
select * from t2;
-UPDATE t1 a ,t2 b SET t1.d=t2.d,t2.d=30 WHERE a.n=b.n;
+UPDATE t1 a ,t2 b SET a.d=b.d,b.d=30 WHERE a.n=b.n;
select * from t1;
select * from t2;
DELETE t1, t2 FROM t1 a,t2 b where a.n=b.n;
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;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 6c3f3d6ac52..eeaf1a83d1a 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -368,6 +368,7 @@ select * from t2;
show status like "Qcache_queries_in_cache";
select * from t3;
show status like "Qcache_queries_in_cache";
+update t1 set i=(select distinct 1 from (select * from t2) a);
drop table t1, t2, t3;
#