diff options
author | unknown <gluh@eagle.(none)> | 2007-06-06 18:33:04 +0500 |
---|---|---|
committer | unknown <gluh@eagle.(none)> | 2007-06-06 18:33:04 +0500 |
commit | 98c7c87e453e03d7c8df168f734009b4c11d95b1 (patch) | |
tree | 03152490a29c670ed41ec1f6494e7e04da06fb85 /mysql-test/t/subselect.test | |
parent | 0304a13ee7140727786adf4feb5e1639e85e8138 (diff) | |
parent | 593afb6a7389639aef111f198cff5f1d5192fad7 (diff) | |
download | mariadb-git-98c7c87e453e03d7c8df168f734009b4c11d95b1.tar.gz |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
mysql-test/r/subselect.result:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/subselect.test:
manual merge
Diffstat (limited to 'mysql-test/t/subselect.test')
-rw-r--r-- | mysql-test/t/subselect.test | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index d565070835e..2ae48a0303f 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -1822,11 +1822,12 @@ SELECT * FROM t1 DROP TABLE t1,t2,t3; # -# BUG #10308: purge log with subselect +# BUG#10308: purge log with subselect +# Bug#28553: mysqld crash in "purge master log before(select time from information_schema)" # - +--error 1064 purge master logs before (select adddate(current_timestamp(), interval -4 day)); - +purge master logs before adddate(current_timestamp(), interval -4 day); # # Bug#18503: Queries with a quantified subquery returning empty set may |