Commit 9af6650a authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/users/grog/4.1
parents 87308abf be559ad6

mysql-test/r/subselect.result

+1 −0
Original line number Diff line number Diff line
@@ -2834,3 +2834,4 @@ a 
3

4

DROP TABLE t1,t2,t3;

purge master logs before (select adddate(current_timestamp(), interval -4 day));

mysql-test/t/subselect.test

+6 −0
Original line number Diff line number Diff line
@@ -1814,4 +1814,10 @@ SELECT * FROM t1 


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

sql/sql_yacc.yy

+4 −1
Original line number Diff line number Diff line
@@ -4715,7 +4715,10 @@ purge_option: 
        }

	| 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");

	    YYABORT;