bk commit into 4.1 tree (elliot:1.2487) BUG#10308

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
4.1 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2487 05/10/10 13:36:05 elliot@stripped +3 -0
  BUG#10308 purge log fails
  Fix a crash when PURGE MASTER LOGS BEFORE is called with a subselect

  sql/sql_yacc.yy
    1.395 05/10/10 13:35:57 elliot@stripped +1 -1
    fix_fields needs to be called before check_cols

  mysql-test/t/subselect.test
    1.153 05/10/10 13:35:57 elliot@stripped +5 -0
    testing PURGE MASTER LOGS BEFORE

  mysql-test/r/subselect.result
    1.173 05/10/10 13:35:57 elliot@stripped +1 -0
    testing PURGE MASTER LOGS BEFORE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/work/mysql-4.1-bug10308

--- 1.394/sql/sql_yacc.yy	2005-09-22 02:46:44 -04:00
+++ 1.395/sql/sql_yacc.yy	2005-10-10 13:35:57 -04:00
@@ -4715,7 +4715,7 @@
         }
 	| BEFORE_SYM expr
 	{
-	  if ($2->check_cols(1) || $2->fix_fields(Lex->thd, 0, &$2))
+	  if ($2->fix_fields(Lex->thd, 0, &$2) || $2->check_cols(1))
 	  {
 	    net_printf(Lex->thd, ER_WRONG_ARGUMENTS, "PURGE LOGS BEFORE");
 	    YYABORT;

--- 1.172/mysql-test/r/subselect.result	2005-08-16 00:42:33 -04:00
+++ 1.173/mysql-test/r/subselect.result	2005-10-10 13:35:57 -04:00
@@ -2834,3 +2834,4 @@
 3
 4
 DROP TABLE t1,t2,t3;
+purge master logs before (select adddate(current_timestamp(), interval -4 day));

--- 1.152/mysql-test/t/subselect.test	2005-08-16 00:42:09 -04:00
+++ 1.153/mysql-test/t/subselect.test	2005-10-10 13:35:57 -04:00
@@ -1814,4 +1814,9 @@
 
 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