MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:April 12 2007 11:52pm
Subject:bk commit into 5.1-falcon tree (hakank:1.2591)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1-falcon repository of hakan. When hakan 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-04-13 01:52:42+02:00, hakank@stripped +1 -0
  After merge fix.
  MERGE: 1.2585.1.1

  sql/sql_yacc.yy@stripped, 2007-04-13 01:52:39+02:00, hakank@stripped +0 -1
    After merge fix.
    MERGE: 1.562.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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon/RESYNC

--- 1.563/sql/sql_yacc.yy	2007-04-13 01:24:26 +02:00
+++ 1.564/sql/sql_yacc.yy	2007-04-13 01:52:39 +02:00
@@ -4289,11 +4289,11 @@
 	| TYPE_SYM opt_equal storage_engines
           {
             Lex->create_info.db_type= $3;
-	    /*
-	       ATTENTION: changed to 5.2 --> 5.3. Because we are using
-               5.1 code base with 5.2.xyz-falcon-alpha as version name.
+            /*
+               ATTENTION: changed 5.2 to 6.1. Because we are using
+               5.1 code base with 6.0.xyz-falcon-alpha as version name.
              */
-            WARN_DEPRECATED(yythd, "5.3", "TYPE=storage_engine",
+            WARN_DEPRECATED(yythd, "6.1", "TYPE=storage_engine",
                             "'ENGINE=storage_engine'");
             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
           }
@@ -5815,12 +5815,12 @@
 	RESTORE_SYM table_or_tables
 	{
 	   Lex->sql_command = SQLCOM_RESTORE_TABLE;
-	   /*
-	      ATTENTION: changed to 5.2 --> 5.3. Because we are using
-              5.1 code base with 5.2.xyz-falcon-alpha as version name.
-            */
-           WARN_DEPRECATED(yythd, "5.3", "RESTORE TABLE",
-                           "MySQL Administrator (mysqldump, mysql)");
+       /*
+          ATTENTION: changed 5.2 to 6.1. Because we are using
+          5.1 code base with 6.0.xyz-falcon-alpha as version name.
+        */
+       WARN_DEPRECATED(yythd, "6.1", "RESTORE TABLE",
+                       "MySQL Administrator (mysqldump, mysql)");
 	}
 	table_list FROM TEXT_STRING_sys
         {
@@ -5831,12 +5831,12 @@
 	BACKUP_SYM table_or_tables
 	{
 	   Lex->sql_command = SQLCOM_BACKUP_TABLE;
-	   /*
-	      ATTENTION: changed to 5.2 --> 5.3. Because we are using
-              5.1 code base with 5.2.xyz-falcon-alpha as version name.
-            */
-           WARN_DEPRECATED(yythd, "5.3", "BACKUP TABLE",
-                           "MySQL Administrator (mysqldump, mysql)");
+       /*
+          ATTENTION: changed 5.2 to 6.1. Because we are using
+          5.1 code base with 6.0.xyz-falcon-alpha as version name.
+        */
+       WARN_DEPRECATED(yythd, "6.1", "BACKUP TABLE",
+                       "MySQL Administrator (mysqldump, mysql)");
 	}
 	table_list TO_SYM TEXT_STRING_sys
         {
@@ -8714,11 +8714,11 @@
         | opt_full PLUGIN_SYM
 	  {
 	    LEX *lex= Lex;
-	    /*
-	       ATTENTION: changed to 5.2 --> 5.3. Because we are using
-               5.1 code base with 5.2.xyz-falcon-alpha as version name.
-             */
-	    WARN_DEPRECATED(yythd, "5.3", "SHOW PLUGIN", "'SHOW PLUGINS'");
+        /*
+           ATTENTION: changed 5.2 to 6.1. Because we are using
+           5.1 code base with 6.0.xyz-falcon-alpha as version name.
+         */
+	    WARN_DEPRECATED(yythd, "6.1", "SHOW PLUGIN", "'SHOW PLUGINS'");
             lex->sql_command= SQLCOM_SHOW_PLUGINS;
             if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
               MYSQL_YYABORT;
@@ -8784,7 +8784,7 @@
 	  {
 	    LEX *lex=Lex;
 	    lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
-	    WARN_DEPRECATED(yythd, "5.3", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
+	    WARN_DEPRECATED(yythd, "6.1", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
 	  }
 	| opt_storage ENGINES_SYM
 	  {
@@ -8834,11 +8834,11 @@
 	      my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
 	      MYSQL_YYABORT;
             }
-	    /*
-	       ATTENTION: changed to 5.2 --> 5.3. Because we are using
-               5.1 code base with 5.2.xyz-falcon-alpha as version name.
-             */
-            WARN_DEPRECATED(yythd, "5.3", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
+          /*
+             ATTENTION: changed 5.2 to 6.1. Because we are using
+             5.1 code base with 6.0.xyz-falcon-alpha as version name.
+           */
+          WARN_DEPRECATED(yythd, "6.1", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
 	  }
         | MUTEX_SYM STATUS_SYM
           {
@@ -8850,11 +8850,11 @@
 	      my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
 	      MYSQL_YYABORT;
             }
-	    /*
-	       ATTENTION: changed to 5.2 --> 5.3. Because we are using
-               5.1 code base with 5.2.xyz-falcon-alpha as version name.
-             */
-            WARN_DEPRECATED(yythd, "5.3", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
+          /*
+             ATTENTION: changed 5.2 to 6.1. Because we are using
+             5.1 code base with 6.0.xyz-falcon-alpha as version name.
+           */
+          WARN_DEPRECATED(yythd, "6.1", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
 	  }
 	| opt_full PROCESSLIST_SYM
 	  { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
@@ -9204,11 +9204,11 @@
         LOAD TABLE_SYM table_ident FROM MASTER_SYM
         {
 	  LEX *lex=Lex;
-	  /*
-	     ATTENTION: changed to 5.2 --> 5.3. Because we are using
-             5.1 code base with 5.2.xyz-falcon-alpha as version name.
+          /*
+             ATTENTION: changed 5.2 to 6.1. Because we are using
+             5.1 code base with 6.0.xyz-falcon-alpha as version name.
            */
-          WARN_DEPRECATED(yythd, "5.3", "LOAD TABLE FROM MASTER",
+          WARN_DEPRECATED(yythd, "6.1", "LOAD TABLE FROM MASTER",
                           "MySQL Administrator (mysqldump, mysql)");
           if (lex->sphead)
 	  {
@@ -9256,11 +9256,11 @@
 	FROM MASTER_SYM
         {
 	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
-	  /*
-	     ATTENTION: changed to 5.2 --> 5.3. Because we are using
-             5.1 code base with 5.2.xyz-falcon-alpha as version name.
+          /*
+             ATTENTION: changed 5.2 to 6.1. Because we are using
+             5.1 code base with 6.0.xyz-falcon-alpha as version name.
            */
-          WARN_DEPRECATED(yythd, "5.3", "LOAD DATA FROM MASTER",
+          WARN_DEPRECATED(yythd, "6.1", "LOAD DATA FROM MASTER",
                           "mysqldump or future "
                           "BACKUP/RESTORE DATABASE facility");
         };
Thread
bk commit into 5.1-falcon tree (hakank:1.2591)Hakan Kuecuekyilmaz13 Apr