summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2006-07-22 02:41:29 +0400
committerunknown <sergefp@mysql.com>2006-07-22 02:41:29 +0400
commit8fc51f7aa6870017192c04db94e09926ec837acb (patch)
tree35bd4dd14173e32a3a04b8fe8613e87cd2c9a422 /mysql-test
parentc13be2300407352b48ccb40825e483b53a66077f (diff)
parent9d432f0dae740bcaa89b61a9b8fced23030d5a13 (diff)
downloadmariadb-git-8fc51f7aa6870017192c04db94e09926ec837acb.tar.gz
Merge mysql.com:/home/psergey/mysql-4.1-opt
into mysql.com:/home/psergey/mysql-5.0-opt2 mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/subselect.result1
-rw-r--r--mysql-test/t/subselect.test2
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 8b10402c823..b7f0866019c 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2914,6 +2914,7 @@ s1
select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
s1
2
+drop table t1;
create table t1 (df decimal(5,1));
insert into t1 values(1.1);
insert into t1 values(2.2);
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index a45d5fc2e43..c9ed62f0e54 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1867,6 +1867,8 @@ select * from t1 where NOT(s1+1 = ANY (select s1 from t1));
select * from t1 where (s1 = ALL (select s1/s1 from t1));
select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
+drop table t1;
+# End of 4.1 tests
# End of 4.1 tests
#