bk commit into 4.1 tree (grog:1.2490) BUG#10308

[Greg Lehey]

Below is the list of changes that have just been committed into a local
4.1 repository of grog. When grog 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.2490 05/10/12 09:47:59 grog@stripped +3 -0
  sql_yacc.yy:
    Bug #10308: Parse 'purge master logs' with subselect correctly.
  subselect.test:
    Bug #10308: Test for 'purge master logs' with subselect.
  subselect.result:
    Bug #10308: Test result for 'purge master logs' with subselect.

  sql/sql_yacc.yy
    1.395 05/10/12 09:44:20 grog@stripped +4 -1
    Bug #10308: Parse 'purge master logs' with subselect correctly.

  mysql-test/t/subselect.test
    1.153 05/10/12 09:43:10 grog@stripped +6 -0
    Bug #10308: Test for 'purge master logs' with subselect.

  mysql-test/r/subselect.result
    1.173 05/10/12 09:39:59 grog@stripped +1 -0
    Bug #10308: Test result for 'purge master logs' with subselect.

# 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:	grog
# Host:	dl145h.mysql.com
# Root:	/users/grog/4.1

--- 1.394/sql/sql_yacc.yy	2005-09-22 08:46:44 +02:00
+++ 1.395/sql/sql_yacc.yy	2005-10-12 09:44:20 +02:00
@@ -4715,7 +4715,10 @@
         }
 	| 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;

--- 1.172/mysql-test/r/subselect.result	2005-08-16 06:42:33 +02:00
+++ 1.173/mysql-test/r/subselect.result	2005-10-12 09:39:59 +02: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 06:42:09 +02:00
+++ 1.153/mysql-test/t/subselect.test	2005-10-12 09:43:10 +02:00
@@ -1814,4 +1814,10 @@
 
 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