bk commit into 4.1 tree (grog:1.2468) 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.2468 05/10/11 16:54:37 grog@stripped +1 -0
  sql_yacc.yy:
    Bug #10308: Purge master logs fails with date.

  sql/sql_yacc.yy
    1.395 05/10/11 13:46:37 grog@stripped +4 -1
    Bug #10308: Purge master logs fails with date.

# 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:	echunga.lemis.com
# Root:	/src/MySQL/mysql-4.1

--- 1.394/sql/sql_yacc.yy	2005-09-22 16:16:44 +09:30
+++ 1.395/sql/sql_yacc.yy	2005-10-11 13:46:37 +09:30
@@ -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 OOM 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;