MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kroki Date:February 8 2007 10:08am
Subject:bk commit into 5.1 tree (kroki:1.2420)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomash. When tomash 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-02-08 13:08:50+03:00, kroki@stripped +1 -0
  Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
  into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug16425
  MERGE: 1.2415.2.1

  sql/sql_yacc.yy@stripped, 2007-02-08 13:08:44+03:00, kroki@stripped +0 -0
    Auto merged
    MERGE: 1.537.1.1

# 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:	kroki
# Host:	moonlight.home
# Root:	/home/tomash/src/mysql_ab/mysql-5.1-bug16425/RESYNC

--- 1.538/sql/sql_yacc.yy	2007-02-08 13:08:59 +03:00
+++ 1.539/sql/sql_yacc.yy	2007-02-08 13:08:59 +03:00
@@ -5104,7 +5104,7 @@ alter:
 	  }
 	  view_list_opt AS view_select view_check_option
 	  {}
-	| ALTER EVENT_SYM sp_name
+	| ALTER definer EVENT_SYM sp_name
           /*
             BE CAREFUL when you add a new rule to update the block where
             YYTHD->client_capabilities is set back to original value
@@ -5120,7 +5120,7 @@ alter:
 
             if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD)))
               YYABORT;
-            Lex->event_parse_data->identifier= $3;
+            Lex->event_parse_data->identifier= $4;
 
             /*
               We have to turn off CLIENT_MULTI_QUERIES while parsing a
@@ -5140,13 +5140,14 @@ alter:
           {
             /*
               $1 - ALTER
-              $2 - EVENT_SYM
-              $3 - sp_name
-              $4 - the block above
+              $2 - definer
+              $3 - EVENT_SYM
+              $4 - sp_name
+              $5 - the block above
             */
-            YYTHD->client_capabilities |= $<ulong_num>4;
+            YYTHD->client_capabilities |= $<ulong_num>5;
 
-            if (!($5 || $6 || $7 || $8 || $9))
+            if (!($6 || $7 || $8 || $9 || $10))
             {
 	      yyerror(ER(ER_SYNTAX_ERROR));
               YYABORT;
Thread
bk commit into 5.1 tree (kroki:1.2420)kroki8 Feb