[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.1 tree (andrey:1.2010)
From:       ahristov () mysql ! com
Date:       2005-12-28 11:00:25
Message-ID: 20051228110025.E88641D2B1 () andrey ! hristov ! com
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2010 05/12/28 13:00:13 andrey@lmy004. +3 -0
  WL #1034 update
  - enable/disable -> enabled/disabled
  - fixed error message

  sql/sql_yacc.yy
    1.429 05/12/28 13:00:01 andrey@lmy004. +6 -2
    ENABLE -> ENABLED
    DISABLE -> DISABLED

  sql/share/errmsg.txt
    1.65 05/12/28 13:00:01 andrey@lmy004. +2 -2
    fix error msg

  sql/lex.h
    1.149 05/12/28 13:00:01 andrey@lmy004. +2 -0
    change ENABLE to ENABLED and DISABLE to DISABLED in 
    create/alter event

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-tt-copy-works

--- 1.148/sql/lex.h	2005-12-02 14:06:40 +02:00
+++ 1.149/sql/lex.h	2005-12-28 13:00:01 +02:00
@@ -165,6 +165,7 @@
   { "DETERMINISTIC",    SYM(DETERMINISTIC_SYM)},
   { "DIRECTORY",	SYM(DIRECTORY_SYM)},
   { "DISABLE",		SYM(DISABLE_SYM)},
+  { "DISABLED",		SYM(DISABLED_SYM)},
   { "DISCARD",		SYM(DISCARD)},
   { "DISTINCT",		SYM(DISTINCT)},
   { "DISTINCTROW",	SYM(DISTINCT)},	/* Access likes this */
@@ -180,6 +181,7 @@
   { "ELSE",             SYM(ELSE)},
   { "ELSEIF",           SYM(ELSEIF_SYM)},
   { "ENABLE",		SYM(ENABLE_SYM)},
+  { "ENABLED",		SYM(ENABLED_SYM)},
   { "ENCLOSED",		SYM(ENCLOSED)},
   { "END",		SYM(END)},
   { "ENDS",		SYM(ENDS_SYM)},

--- 1.428/sql/sql_yacc.yy	2005-12-15 15:07:55 +02:00
+++ 1.429/sql/sql_yacc.yy	2005-12-28 13:00:01 +02:00
@@ -240,6 +240,7 @@
 %token  DETERMINISTIC_SYM
 %token  DIRECTORY_SYM
 %token  DISABLE_SYM
+%token  DISABLED_SYM
 %token  DISCARD
 %token  DISTINCT
 %token  DIV_SYM
@@ -254,6 +255,7 @@
 %token  ELSEIF_SYM
 %token  ELT_FUNC
 %token  ENABLE_SYM
+%token  ENABLED_SYM
 %token  ENCLOSED
 %token  ENCODE_SYM
 %token  ENCRYPT
@@ -1410,13 +1412,13 @@
       ;
     
 ev_status: /* empty */
-        | ENABLE_SYM
+        | ENABLED_SYM
           {
             LEX *lex=Lex;
             if (!lex->et_compile_phase)
               lex->et->status= MYSQL_EVENT_ENABLED;	   
           }
-        | DISABLE_SYM
+        | DISABLED_SYM
           {
             LEX *lex=Lex;
             
@@ -8592,6 +8594,7 @@
 	| DELAY_KEY_WRITE_SYM	{}
 	| DES_KEY_FILE		{}
 	| DIRECTORY_SYM		{}
+	| DISABLED_SYM		{}
 	| DISCARD		{}
 	| DUMPFILE		{}
 	| DUPLICATE_SYM		{}
@@ -8611,6 +8614,7 @@
 	| FOUND_SYM		{}
 	| DISABLE_SYM		{}
 	| ENABLE_SYM		{}
+	| ENABLED_SYM		{}
 	| FULL			{}
 	| FILE_SYM		{}
 	| FIRST_SYM		{}

--- 1.64/sql/share/errmsg.txt	2005-12-28 12:07:44 +02:00
+++ 1.65/sql/share/errmsg.txt	2005-12-28 13:00:01 +02:00
@@ -5726,9 +5726,9 @@
 ER_EVENT_STORE_FAILED
         eng "Failed to store event %s. Error code %d from storage engine."
 ER_EVENT_DOES_NOT_EXIST
-        eng "Unknown event '%s'"
+        eng "Unknown event '%-.64s'"
 ER_EVENT_CANT_ALTER
-        eng "Failed to alter event %s"
+        eng "Failed to alter event '%-.64s'"
 ER_EVENT_DROP_FAILED
         eng "Failed to drop %s"
 ER_EVENT_INTERVAL_NOT_POSITIVE

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]