bk commit into 5.1 tree (ingo:1.2298)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.2298 06/04/07 14:39:49 ingo@stripped +3 -0
  Merge mysql.com:/home/mydev/mysql-5.1
  into  mysql.com:/home/mydev/mysql-5.1-aid

  sql/sql_yacc.yy
    1.487 06/04/07 14:39:42 ingo@stripped +0 -0
    Auto merged

  mysql-test/t/information_schema.test
    1.75 06/04/07 14:39:41 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.115 06/04/07 14:39:41 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-aid/RESYNC

--- 1.486/sql/sql_yacc.yy	2006-03-30 20:55:48 +02:00
+++ 1.487/sql/sql_yacc.yy	2006-04-07 14:39:42 +02:00
@@ -501,6 +501,7 @@
 %token  PARAM_MARKER
 %token  PHASE_SYM
 %token  PLUGIN_SYM
+%token  PLUGINS_SYM
 %token  POINTFROMTEXT
 %token  POINT_SYM
 %token  POLYFROMTEXT
@@ -8175,6 +8176,15 @@
         | PLUGIN_SYM
 	  {
 	    LEX *lex= Lex;
+	    WARN_DEPRECATED(yythd, "5.2", "SHOW PLUGIN", "'SHOW PLUGINS'");
+            lex->sql_command= SQLCOM_SELECT;
+            lex->orig_sql_command= SQLCOM_SHOW_PLUGINS;
+            if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
+              YYABORT;
+	  }
+        | PLUGINS_SYM
+	  {
+	    LEX *lex= Lex;
             lex->sql_command= SQLCOM_SELECT;
             lex->orig_sql_command= SQLCOM_SHOW_PLUGINS;
             if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
@@ -9361,7 +9371,6 @@
 	| OPEN_SYM		{}
         | PARSER_SYM            {}
 	| PARTITION_SYM		{}
-        | PLUGIN_SYM            {}
         | PREPARE_SYM           {}
 	| REMOVE_SYM		{}
 	| REPAIR		{}
@@ -9542,6 +9551,8 @@
 	| PARTITIONS_SYM	{}
 	| PASSWORD		{}
         | PHASE_SYM             {}
+        | PLUGIN_SYM            {}
+        | PLUGINS_SYM           {}
 	| POINT_SYM		{}
 	| POLYGON		{}
         | PRESERVE_SYM          {}
@@ -9555,7 +9566,7 @@
         | REBUILD_SYM           {}
         | RECOVER_SYM           {}
 	| REDO_BUFFER_SIZE_SYM	{}
-	| REDOFILE_SYM  	{}
+	| REDOFILE_SYM          {}
         | REDUNDANT_SYM         {}
 	| RELAY_LOG_FILE_SYM	{}
 	| RELAY_LOG_POS_SYM	{}

--- 1.114/mysql-test/r/information_schema.result	2006-04-05 20:35:28 +02:00
+++ 1.115/mysql-test/r/information_schema.result	2006-04-07 14:39:41 +02:00
@@ -1084,14 +1084,6 @@
 1
 use test;
 drop table t1;
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-from information_schema.columns where table_name='t1';
-data_type	character_octet_length	character_maximum_length
-blob	65535	65535
-text	65535	65535
-text	65535	32767
-drop table t1;
 create table t1 (f1 int(11));
 create view v1 as select * from t1;
 drop table t1;

--- 1.74/mysql-test/t/information_schema.test	2006-04-05 20:35:28 +02:00
+++ 1.75/mysql-test/t/information_schema.test	2006-04-07 14:39:41 +02:00
@@ -743,15 +743,6 @@
 drop table t1;
 
 #
-# Bug #14290: character_maximum_length for text fields
-#
-
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-  from information_schema.columns where table_name='t1';
-drop table t1;
-
-#
 # Bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
 #
 create table t1 (f1 int(11));