mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into  mysql.com:/users/grog/4.1
This commit is contained in:
grog@mysql.com 2005-10-12 09:54:20 +02:00
commit d1132f0ef1
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/subselect.result
View file

@ -2834,3 +2834,4 @@ a
3 3
4 4
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
purge master logs before (select adddate(current_timestamp(), interval -4 day));

6
mysql-test/t/subselect.test
View file

@ -1814,4 +1814,10 @@ SELECT * FROM t1
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
#
# BUG #10308: purge log with subselect
#
purge master logs before (select adddate(current_timestamp(), interval -4 day));
# End of 4.1 tests # End of 4.1 tests

5
sql/sql_yacc.yy
View file

@ -4715,7 +4715,10 @@ purge_option:
} }
| BEFORE_SYM expr | BEFORE_SYM expr
{ {
if ($2->check_cols(1) || $2->fix_fields(Lex->thd, 0, &$2)) if (!$2)
/* Can only be an out of memory situation, no need for a message */
YYABORT;
if ($2->fix_fields(Lex->thd, 0, &$2) || $2->check_cols(1))
{ {
net_printf(Lex->thd, ER_WRONG_ARGUMENTS, "PURGE LOGS BEFORE"); net_printf(Lex->thd, ER_WRONG_ARGUMENTS, "PURGE LOGS BEFORE");
YYABORT; YYABORT;