bk commit into 5.0 tree (gluh:1.2515)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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@stripped, 2007-06-06 18:33:04+05:00, gluh@eagle.(none) +3 -0
  Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
  into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
  MERGE: 1.1616.2877.104

  mysql-test/r/subselect.result@stripped, 2007-06-06 18:31:08+05:00, gluh@eagle.(none) +0 -0
    Auto merged
    MERGE: 1.67.1.122

  mysql-test/t/subselect.test@stripped, 2007-06-06 18:33:02+05:00, gluh@eagle.(none) +4 -7
    manual merge
    MERGE: 1.58.1.107

  sql/sql_yacc.yy@stripped, 2007-06-06 18:31:08+05:00, gluh@eagle.(none) +0 -0
    Auto merged
    MERGE: 1.203.1.202

# 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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.0-opt/RESYNC

--- 1.521/sql/sql_yacc.yy	2007-06-03 12:03:14 +05:00
+++ 1.522/sql/sql_yacc.yy	2007-06-06 18:31:08 +05:00
@@ -5820,7 +5820,8 @@ select_derived2:
 	  LEX *lex= Lex;
 	  lex->derived_tables|= DERIVED_SUBQUERY;
           if (lex->sql_command == (int)SQLCOM_HA_READ ||
-              lex->sql_command == (int)SQLCOM_KILL)
+              lex->sql_command == (int)SQLCOM_KILL ||
+              lex->sql_command == (int)SQLCOM_PURGE)
 	  {
             my_parse_error(ER(ER_SYNTAX_ERROR));
 	    MYSQL_YYABORT;
@@ -7272,6 +7273,7 @@ purge:
 	{
 	  LEX *lex=Lex;
 	  lex->type=0;
+          lex->sql_command = SQLCOM_PURGE;
 	} purge_options
 	{}
 	;
@@ -7283,7 +7285,6 @@ purge_options:
 purge_option:
         TO_SYM TEXT_STRING_sys
         {
-	   Lex->sql_command = SQLCOM_PURGE;
 	   Lex->to_log = $2.str;
         }
 	| BEFORE_SYM expr
@@ -9402,7 +9403,8 @@ subselect_start:
 	{
 	  LEX *lex=Lex;
           if (lex->sql_command == (int)SQLCOM_HA_READ ||
-              lex->sql_command == (int)SQLCOM_KILL)
+              lex->sql_command == (int)SQLCOM_KILL ||
+              lex->sql_command == (int)SQLCOM_PURGE)
 	  {
             my_parse_error(ER(ER_SYNTAX_ERROR));
 	    MYSQL_YYABORT;

--- 1.191/mysql-test/r/subselect.result	2007-06-02 23:44:11 +05:00
+++ 1.192/mysql-test/r/subselect.result	2007-06-06 18:31:08 +05:00
@@ -2854,6 +2854,8 @@ a
 4
 DROP TABLE t1,t2,t3;
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'select
adddate(current_timestamp(), interval -4 day))' at line 1
+purge master logs before adddate(current_timestamp(), interval -4 day);
 CREATE TABLE t1 (f1 INT);
 CREATE TABLE t2 (f2 INT);
 INSERT INTO t1 VALUES (1);

--- 1.153/mysql-test/t/subselect.test	2007-06-02 23:44:11 +05:00
+++ 1.154/mysql-test/t/subselect.test	2007-06-06 18:33:02 +05:00
@@ -1822,11 +1822,12 @@ SELECT * FROM t1
 DROP TABLE t1,t2,t3;
 
 #
-# BUG #10308: purge log with subselect
+# BUG#10308: purge log with subselect
+# Bug#28553: mysqld crash in "purge master log before(select time from
information_schema)"
 #
-
+--error 1064
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
-
+purge master logs before adddate(current_timestamp(), interval -4 day);
 
 #
 # Bug#18503: Queries with a quantified subquery returning empty set may