diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 13:45:56 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 13:45:56 +0300 |
| commit | bbc86525a1a02367c1a77f104f6b1ae7a8f17c51 (patch) | |
| tree | 42fb1db881900588ca6d4b0cce2a7d825736863a /mysql-test/t/subselect.test | |
| parent | 7cff13025bfb2032df8b0f604654e1a0a0f33e10 (diff) | |
| parent | bab65b05e240a91653e9a3ba4bd0146496d91803 (diff) | |
| download | mariadb-git-bbc86525a1a02367c1a77f104f6b1ae7a8f17c51.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/rename.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/time.cc:
Auto merged
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 6d5082c360b..dee5b1e4fb0 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) |