diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-06 13:16:57 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-06 13:16:57 +0200 |
commit | 471798a13704fe25acc2859b369bf13949be36d9 (patch) | |
tree | 043518a35d5249e9fec4d872fc5312ebda1b6ec4 /mysql-test/t/subselect.test | |
parent | b26fb43b78118ba5bb3c082c3f3e4bfa7e00c5ad (diff) | |
parent | ca9faacf9a1615b7ab8be01521c3cbd96575e5f1 (diff) | |
download | mariadb-git-471798a13704fe25acc2859b369bf13949be36d9.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
BitKeeper/deleted/.del-mtr_im.pl:
Delete: mysql-test/lib/mtr_im.pl
client/mysqltest.c:
Use remote
mysql-test/mysql-test-run.pl:
Use remote
mysql-test/lib/mtr_process.pl:
Use remote
Diffstat (limited to 'mysql-test/t/subselect.test')
-rw-r--r-- | mysql-test/t/subselect.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 7811301a9bc..d357b983703 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -1728,7 +1728,7 @@ select (select a from t1) = (1,2); select (1,2,3) = (select * from t1); -- error 1241 select (select * from t1) = (1,2,3); -drop table t1 +drop table t1; # # Item_int_with_ref check (BUG#10020) |