2924 Sergey Glukhov 2008-11-13 [merge]
Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTINES, TRIGGERS
changed 'charset', 'collation' field length from 64 to MY_CS_NAME_SIZE(32)
in tables:
SCHEMATA, TABLES, COLUMNS, CHARACTER_SETS,
COLLATIONS, COLLATION_CHARACTER_SET_APPLICABILITY
addon: 'show_check' test is enabled
modified:
mysql-test/r/create.result
mysql-test/r/information_schema.result
mysql-test/r/show_check.result
mysql-test/suite/funcs_1/r/is_character_sets.result
mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
mysql-test/suite/funcs_1/r/is_collations.result
mysql-test/suite/funcs_1/r/is_columns.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_schemata.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/t/disabled.def
mysql-test/t/show_check.test
sql/sql_show.cc
2923 Sergey Glukhov 2008-11-13 [merge]
5.1-bugteam->6.0-bugteam automerge(bug#36035)
modified:
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/r/is_tables.result
2922 Kristofer Pettersson 2008-11-11 [merge]
Automerge
modified:
mysys/my_init.c
support-files/mysql.spec.sh
=== modified file 'mysql-test/r/create.result'
--- a/mysql-test/r/create.result 2008-10-22 11:51:28 +0000
+++ b/mysql-test/r/create.result 2008-11-13 11:11:02 +0000
@@ -1759,8 +1759,8 @@ create table t1 like information_schema.
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result 2008-10-09 13:02:56 +0000
+++ b/mysql-test/r/information_schema.result 2008-11-13 11:11:02 +0000
@@ -527,8 +527,8 @@ drop table t1;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8
@@ -536,8 +536,8 @@ set names latin2;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8
@@ -551,8 +551,8 @@ alter table t1 default character set utf
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -729,8 +729,8 @@ select column_type from information_sche
where table_schema="information_schema" and table_name="COLUMNS" and
(column_name="character_set_name" or column_name="collation_name");
column_type
-varchar(64)
-varchar(64)
+varchar(32)
+varchar(32)
select TABLE_ROWS from information_schema.tables where
table_schema="information_schema" and table_name="COLUMNS";
TABLE_ROWS
=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result 2008-10-09 13:02:56 +0000
+++ b/mysql-test/r/show_check.result 2008-11-13 11:11:02 +0000
@@ -101,19 +101,19 @@ drop table t1;
show variables like "wait_timeout%";
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def VARIABLES VARIABLE_NAME Variable_name 253 64 12 N 1 0 8
-def VARIABLES VARIABLE_VALUE Value 253 20480 5 Y 0 0 8
+def VARIABLES VARIABLE_VALUE Value 253 16300 5 Y 0 0 8
Variable_name Value
wait_timeout 28800
show variables like "WAIT_timeout%";
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def VARIABLES VARIABLE_NAME Variable_name 253 64 12 N 1 0 8
-def VARIABLES VARIABLE_VALUE Value 253 20480 5 Y 0 0 8
+def VARIABLES VARIABLE_VALUE Value 253 16300 5 Y 0 0 8
Variable_name Value
wait_timeout 28800
show variables like "this_doesn't_exists%";
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def VARIABLES VARIABLE_NAME Variable_name 253 64 0 N 1 0 8
-def VARIABLES VARIABLE_VALUE Value 253 20480 0 Y 0 0 8
+def VARIABLES VARIABLE_VALUE Value 253 16300 0 Y 0 0 8
Variable_name Value
show table status from test like "this_doesn't_exists%";
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
@@ -131,7 +131,7 @@ def TABLES AUTO_INCREMENT Auto_increme
def TABLES CREATE_TIME Create_time 12 19 0 Y 128 0 63
def TABLES UPDATE_TIME Update_time 12 19 0 Y 128 0 63
def TABLES CHECK_TIME Check_time 12 19 0 Y 128 0 63
-def TABLES TABLE_COLLATION Collation 253 64 0 Y 0 0 8
+def TABLES TABLE_COLLATION Collation 253 32 0 Y 0 0 8
def TABLES CHECKSUM Checksum 8 21 0 Y 32800 0 63
def TABLES CREATE_OPTIONS Create_options 253 255 0 Y 0 0 8
def TABLES TABLE_COMMENT Comment 253 2048 0 N 1 0 8
@@ -738,20 +738,11 @@ View Create View character_set_client co
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache now() AS `NOW()` binary binary
DROP VIEW v1;
CREATE VIEW v1 AS SELECT SQL_CACHE SQL_NO_CACHE NOW();
-SHOW CREATE VIEW v1;
-View Create View character_set_client collation_connection
-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache now() AS `NOW()` binary binary
-DROP VIEW v1;
+ERROR HY000: Incorrect usage of SQL_CACHE and SQL_NO_CACHE
CREATE VIEW v1 AS SELECT SQL_NO_CACHE SQL_CACHE NOW();
-SHOW CREATE VIEW v1;
-View Create View character_set_client collation_connection
-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache now() AS `NOW()` binary binary
-DROP VIEW v1;
+ERROR HY000: Incorrect usage of SQL_NO_CACHE and SQL_CACHE
CREATE VIEW v1 AS SELECT SQL_CACHE SQL_NO_CACHE SQL_CACHE NOW();
-SHOW CREATE VIEW v1;
-View Create View character_set_client collation_connection
-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache now() AS `NOW()` binary binary
-DROP VIEW v1;
+ERROR HY000: Incorrect usage of SQL_CACHE and SQL_NO_CACHE
CREATE PROCEDURE p1()
BEGIN
SET @s= 'CREATE VIEW v1 AS SELECT SQL_CACHE 1';
@@ -809,7 +800,6 @@ show plugins;
show columns in t1;
show slave hosts;
show keys in t1;
-show column types;
show storage engines;
show authors;
show contributors;
@@ -859,41 +849,41 @@ set names utf8;
----------------------------------------------------------------
SHOW CHARACTER SET LIKE 'utf8';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def CHARACTER_SETS CHARACTER_SET_NAME Charset 253 192 4 N 1 0 33
-def CHARACTER_SETS DESCRIPTION Description 253 180 13 N 1 0 33
-def CHARACTER_SETS DEFAULT_COLLATE_NAME Default collation 253 192 15 N 1 0 33
+def CHARACTER_SETS CHARACTER_SET_NAME Charset 253 128 4 N 1 0 45
+def CHARACTER_SETS DESCRIPTION Description 253 240 13 N 1 0 45
+def CHARACTER_SETS DEFAULT_COLLATE_NAME Default collation 253 128 15 N 1 0 45
def CHARACTER_SETS MAXLEN Maxlen 8 3 1 N 32769 0 63
Charset Description Default collation Maxlen
-utf8 UTF-8 Unicode utf8_general_ci 3
+utf8 UTF-8 Unicode utf8_general_ci 4
----------------------------------------------------------------
SHOW COLLATION LIKE 'latin1_bin';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def COLLATIONS COLLATION_NAME Collation 253 192 10 N 1 0 33
-def COLLATIONS CHARACTER_SET_NAME Charset 253 192 6 N 1 0 33
+def COLLATIONS COLLATION_NAME Collation 253 128 10 N 1 0 45
+def COLLATIONS CHARACTER_SET_NAME Charset 253 128 6 N 1 0 45
def COLLATIONS ID Id 8 11 2 N 32769 0 63
-def COLLATIONS IS_DEFAULT Default 253 9 0 N 1 0 33
-def COLLATIONS IS_COMPILED Compiled 253 9 3 N 1 0 33
+def COLLATIONS IS_DEFAULT Default 253 12 0 N 1 0 45
+def COLLATIONS IS_COMPILED Compiled 253 12 3 N 1 0 45
def COLLATIONS SORTLEN Sortlen 8 3 1 N 32769 0 63
Collation Charset Id Default Compiled Sortlen
latin1_bin latin1 47 Yes 1
----------------------------------------------------------------
SHOW CREATE DATABASE mysqltest1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def Database 253 192 10 N 1 31 33
-def Create Database 253 3072 69 N 1 31 33
+def Database 253 256 10 N 1 31 45
+def Create Database 253 4096 69 N 1 31 45
Database Create Database
mysqltest1 CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 */
----------------------------------------------------------------
SHOW DATABASES LIKE 'mysqltest1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def SCHEMATA SCHEMA_NAME Database (mysqltest1) 253 192 10 N 1 0 33
+def SCHEMATA SCHEMA_NAME Database (mysqltest1) 253 256 10 N 1 0 45
Database (mysqltest1)
mysqltest1
----------------------------------------------------------------
SHOW CREATE TABLE t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def Table 253 192 2 N 1 31 33
-def Create Table 253 3072 102 N 1 31 33
+def Table 253 256 2 N 1 31 45
+def Create Table 253 4096 102 N 1 31 45
Table Create Table
t1 CREATE TABLE `t1` (
`c` int(11) NOT NULL,
@@ -902,19 +892,19 @@ t1 CREATE TABLE `t1` (
----------------------------------------------------------------
SHOW INDEX FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def STATISTICS TABLE_NAME Table 253 192 2 N 1 0 33
+def STATISTICS TABLE_NAME Table 253 256 2 N 1 0 45
def STATISTICS NON_UNIQUE Non_unique 8 1 1 N 32769 0 63
-def STATISTICS INDEX_NAME Key_name 253 192 7 N 1 0 33
+def STATISTICS INDEX_NAME Key_name 253 256 7 N 1 0 45
def STATISTICS SEQ_IN_INDEX Seq_in_index 8 2 1 N 32769 0 63
-def STATISTICS COLUMN_NAME Column_name 253 192 1 N 1 0 33
-def STATISTICS COLLATION Collation 253 3 1 Y 0 0 33
+def STATISTICS COLUMN_NAME Column_name 253 256 1 N 1 0 45
+def STATISTICS COLLATION Collation 253 4 1 Y 0 0 45
def STATISTICS CARDINALITY Cardinality 8 21 1 Y 32768 0 63
def STATISTICS SUB_PART Sub_part 8 3 0 Y 32768 0 63
-def STATISTICS PACKED Packed 253 30 0 Y 0 0 33
-def STATISTICS NULLABLE Null 253 9 0 N 1 0 33
-def STATISTICS INDEX_TYPE Index_type 253 48 5 N 1 0 33
-def STATISTICS COMMENT Comment 253 48 0 Y 0 0 33
-def STATISTICS INDEX_COMMENT Index_Comment 253 3072 0 N 1 0 33
+def STATISTICS PACKED Packed 253 40 0 Y 0 0 45
+def STATISTICS NULLABLE Null 253 12 0 N 1 0 45
+def STATISTICS INDEX_TYPE Index_type 253 64 5 N 1 0 45
+def STATISTICS COMMENT Comment 253 64 0 Y 0 0 45
+def STATISTICS INDEX_COMMENT Index_Comment 253 4096 0 N 1 0 45
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_Comment
t1 0 PRIMARY 1 c A 0 NULL NULL BTREE
----------------------------------------------------------------
@@ -931,15 +921,15 @@ TABLE_COMMENT
FROM INFORMATION_SCHEMA.TABLES
WHERE table_name = 't1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def TABLES TABLE_CATALOG TABLE_CATALOG 253 1536 0 Y 0 0 33
-def TABLES TABLE_SCHEMA TABLE_SCHEMA 253 192 4 N 1 0 33
-def TABLES TABLE_NAME TABLE_NAME 253 192 2 N 1 0 33
-def TABLES TABLE_TYPE TABLE_TYPE 253 192 10 N 1 0 33
-def TABLES ENGINE ENGINE 253 192 6 Y 0 0 33
-def TABLES ROW_FORMAT ROW_FORMAT 253 30 5 Y 0 0 33
-def TABLES TABLE_COLLATION TABLE_COLLATION 253 192 17 Y 0 0 33
-def TABLES CREATE_OPTIONS CREATE_OPTIONS 253 765 0 Y 0 0 33
-def TABLES TABLE_COMMENT TABLE_COMMENT 253 6144 0 N 1 0 33
+def TABLES TABLE_CATALOG TABLE_CATALOG 253 2048 0 Y 0 0 45
+def TABLES TABLE_SCHEMA TABLE_SCHEMA 253 256 4 N 1 0 45
+def TABLES TABLE_NAME TABLE_NAME 253 256 2 N 1 0 45
+def TABLES TABLE_TYPE TABLE_TYPE 253 256 10 N 1 0 45
+def TABLES ENGINE ENGINE 253 256 6 Y 0 0 45
+def TABLES ROW_FORMAT ROW_FORMAT 253 40 5 Y 0 0 45
+def TABLES TABLE_COLLATION TABLE_COLLATION 253 128 17 Y 0 0 45
+def TABLES CREATE_OPTIONS CREATE_OPTIONS 253 1020 0 Y 0 0 45
+def TABLES TABLE_COMMENT TABLE_COMMENT 253 8192 0 N 1 0 45
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE ROW_FORMAT TABLE_COLLATION CREATE_OPTIONS TABLE_COMMENT
NULL test t1 BASE TABLE MyISAM Fixed latin1_swedish_ci
----------------------------------------------------------------
@@ -961,53 +951,53 @@ COLUMN_COMMENT
FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 't1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def COLUMNS TABLE_CATALOG TABLE_CATALOG 253 1536 0 Y 0 0 33
-def COLUMNS TABLE_SCHEMA TABLE_SCHEMA 253 192 4 N 1 0 33
-def COLUMNS TABLE_NAME TABLE_NAME 253 192 2 N 1 0 33
-def COLUMNS COLUMN_NAME COLUMN_NAME 253 192 1 N 1 0 33
-def COLUMNS COLUMN_DEFAULT COLUMN_DEFAULT 252 589815 0 Y 16 0 33
-def COLUMNS IS_NULLABLE IS_NULLABLE 253 9 2 N 1 0 33
-def COLUMNS DATA_TYPE DATA_TYPE 253 192 3 N 1 0 33
-def COLUMNS CHARACTER_SET_NAME CHARACTER_SET_NAME 253 192 0 Y 0 0 33
-def COLUMNS COLLATION_NAME COLLATION_NAME 253 192 0 Y 0 0 33
-def COLUMNS COLUMN_TYPE COLUMN_TYPE 252 589815 7 N 17 0 33
-def COLUMNS COLUMN_KEY COLUMN_KEY 253 9 3 N 1 0 33
-def COLUMNS EXTRA EXTRA 253 81 0 N 1 0 33
-def COLUMNS PRIVILEGES PRIVILEGES 253 240 31 N 1 0 33
-def COLUMNS COLUMN_COMMENT COLUMN_COMMENT 253 3072 0 N 1 0 33
+def COLUMNS TABLE_CATALOG TABLE_CATALOG 253 2048 0 Y 0 0 45
+def COLUMNS TABLE_SCHEMA TABLE_SCHEMA 253 256 4 N 1 0 45
+def COLUMNS TABLE_NAME TABLE_NAME 253 256 2 N 1 0 45
+def COLUMNS COLUMN_NAME COLUMN_NAME 253 256 1 N 1 0 45
+def COLUMNS COLUMN_DEFAULT COLUMN_DEFAULT 252 1048560 0 Y 16 0 45
+def COLUMNS IS_NULLABLE IS_NULLABLE 253 12 2 N 1 0 45
+def COLUMNS DATA_TYPE DATA_TYPE 253 256 3 N 1 0 45
+def COLUMNS CHARACTER_SET_NAME CHARACTER_SET_NAME 253 128 0 Y 0 0 45
+def COLUMNS COLLATION_NAME COLLATION_NAME 253 128 0 Y 0 0 45
+def COLUMNS COLUMN_TYPE COLUMN_TYPE 252 1048560 7 N 17 0 45
+def COLUMNS COLUMN_KEY COLUMN_KEY 253 12 3 N 1 0 45
+def COLUMNS EXTRA EXTRA 253 108 0 N 1 0 45
+def COLUMNS PRIVILEGES PRIVILEGES 253 320 31 N 1 0 45
+def COLUMNS COLUMN_COMMENT COLUMN_COMMENT 253 4096 0 N 1 0 45
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
NULL test t1 c NULL NO int NULL NULL int(11) PRI select,insert,update,references
----------------------------------------------------------------
SHOW TABLES LIKE 't1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def TABLE_NAMES TABLE_NAME Tables_in_test (t1) 253 192 2 N 1 0 33
+def TABLE_NAMES TABLE_NAME Tables_in_test (t1) 253 256 2 N 1 0 45
Tables_in_test (t1)
t1
----------------------------------------------------------------
SHOW COLUMNS FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def COLUMNS COLUMN_NAME Field 253 192 1 N 1 0 33
-def COLUMNS COLUMN_TYPE Type 252 589815 7 N 17 0 33
-def COLUMNS IS_NULLABLE Null 253 9 2 N 1 0 33
-def COLUMNS COLUMN_KEY Key 253 9 3 N 1 0 33
-def COLUMNS COLUMN_DEFAULT Default 252 589815 0 Y 16 0 33
-def COLUMNS EXTRA Extra 253 81 0 N 1 0 33
+def COLUMNS COLUMN_NAME Field 253 256 1 N 1 0 45
+def COLUMNS COLUMN_TYPE Type 252 1048560 7 N 17 0 45
+def COLUMNS IS_NULLABLE Null 253 12 2 N 1 0 45
+def COLUMNS COLUMN_KEY Key 253 12 3 N 1 0 45
+def COLUMNS COLUMN_DEFAULT Default 252 1048560 0 Y 16 0 45
+def COLUMNS EXTRA Extra 253 108 0 N 1 0 45
Field Type Null Key Default Extra
c int(11) NO PRI NULL
----------------------------------------------------------------
SHOW TRIGGERS LIKE 't1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def TRIGGERS TRIGGER_NAME Trigger 253 192 5 N 1 0 33
-def TRIGGERS EVENT_MANIPULATION Event 253 18 6 N 1 0 33
-def TRIGGERS EVENT_OBJECT_TABLE Table 253 192 2 N 1 0 33
-def TRIGGERS ACTION_STATEMENT Statement 252 589815 10 N 17 0 33
-def TRIGGERS ACTION_TIMING Timing 253 18 6 N 1 0 33
+def TRIGGERS TRIGGER_NAME Trigger 253 256 5 N 1 0 45
+def TRIGGERS EVENT_MANIPULATION Event 253 24 6 N 1 0 45
+def TRIGGERS EVENT_OBJECT_TABLE Table 253 256 2 N 1 0 45
+def TRIGGERS ACTION_STATEMENT Statement 252 1048560 10 N 17 0 45
+def TRIGGERS ACTION_TIMING Timing 253 24 6 N 1 0 45
def TRIGGERS CREATED Created 12 19 0 Y 128 0 63
-def TRIGGERS SQL_MODE sql_mode 253 24576 0 N 1 0 33
-def TRIGGERS DEFINER Definer 253 231 14 N 1 0 33
-def TRIGGERS CHARACTER_SET_CLIENT character_set_client 253 96 6 N 1 0 33
-def TRIGGERS COLLATION_CONNECTION collation_connection 253 96 6 N 1 0 33
-def TRIGGERS DATABASE_COLLATION Database Collation 253 96 17 N 1 0 33
+def TRIGGERS SQL_MODE sql_mode 253 32768 0 N 1 0 45
+def TRIGGERS DEFINER Definer 253 308 14 N 1 0 45
+def TRIGGERS CHARACTER_SET_CLIENT character_set_client 253 128 6 N 1 0 45
+def TRIGGERS COLLATION_CONNECTION collation_connection 253 128 6 N 1 0 45
+def TRIGGERS DATABASE_COLLATION Database Collation 253 128 17 N 1 0 45
Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
t1_bi INSERT t1 SET @a = 1 BEFORE NULL root@localhost binary binary latin1_swedish_ci
----------------------------------------------------------------
@@ -1032,32 +1022,32 @@ DEFINER
FROM INFORMATION_SCHEMA.TRIGGERS
WHERE trigger_name = 't1_bi';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def TRIGGERS TRIGGER_CATALOG TRIGGER_CATALOG 253 1536 0 Y 0 0 33
-def TRIGGERS TRIGGER_SCHEMA TRIGGER_SCHEMA 253 192 4 N 1 0 33
-def TRIGGERS TRIGGER_NAME TRIGGER_NAME 253 192 5 N 1 0 33
-def TRIGGERS EVENT_MANIPULATION EVENT_MANIPULATION 253 18 6 N 1 0 33
-def TRIGGERS EVENT_OBJECT_CATALOG EVENT_OBJECT_CATALOG 253 1536 0 Y 0 0 33
-def TRIGGERS EVENT_OBJECT_SCHEMA EVENT_OBJECT_SCHEMA 253 192 4 N 1 0 33
-def TRIGGERS EVENT_OBJECT_TABLE EVENT_OBJECT_TABLE 253 192 2 N 1 0 33
-def TRIGGERS ACTION_CONDITION ACTION_CONDITION 252 589815 0 Y 16 0 33
-def TRIGGERS ACTION_STATEMENT ACTION_STATEMENT 252 589815 10 N 17 0 33
-def TRIGGERS ACTION_ORIENTATION ACTION_ORIENTATION 253 27 3 N 1 0 33
-def TRIGGERS ACTION_TIMING ACTION_TIMING 253 18 6 N 1 0 33
-def TRIGGERS ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_OLD_TABLE 253 192 0 Y 0 0 33
-def TRIGGERS ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_NEW_TABLE 253 192 0 Y 0 0 33
-def TRIGGERS ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_OLD_ROW 253 9 3 N 1 0 33
-def TRIGGERS ACTION_REFERENCE_NEW_ROW ACTION_REFERENCE_NEW_ROW 253 9 3 N 1 0 33
-def TRIGGERS SQL_MODE SQL_MODE 253 24576 0 N 1 0 33
-def TRIGGERS DEFINER DEFINER 253 231 14 N 1 0 33
+def TRIGGERS TRIGGER_CATALOG TRIGGER_CATALOG 253 2048 0 Y 0 0 45
+def TRIGGERS TRIGGER_SCHEMA TRIGGER_SCHEMA 253 256 4 N 1 0 45
+def TRIGGERS TRIGGER_NAME TRIGGER_NAME 253 256 5 N 1 0 45
+def TRIGGERS EVENT_MANIPULATION EVENT_MANIPULATION 253 24 6 N 1 0 45
+def TRIGGERS EVENT_OBJECT_CATALOG EVENT_OBJECT_CATALOG 253 2048 0 Y 0 0 45
+def TRIGGERS EVENT_OBJECT_SCHEMA EVENT_OBJECT_SCHEMA 253 256 4 N 1 0 45
+def TRIGGERS EVENT_OBJECT_TABLE EVENT_OBJECT_TABLE 253 256 2 N 1 0 45
+def TRIGGERS ACTION_CONDITION ACTION_CONDITION 252 1048560 0 Y 16 0 45
+def TRIGGERS ACTION_STATEMENT ACTION_STATEMENT 252 1048560 10 N 17 0 45
+def TRIGGERS ACTION_ORIENTATION ACTION_ORIENTATION 253 36 3 N 1 0 45
+def TRIGGERS ACTION_TIMING ACTION_TIMING 253 24 6 N 1 0 45
+def TRIGGERS ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_OLD_TABLE 253 256 0 Y 0 0 45
+def TRIGGERS ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_NEW_TABLE 253 256 0 Y 0 0 45
+def TRIGGERS ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_OLD_ROW 253 12 3 N 1 0 45
+def TRIGGERS ACTION_REFERENCE_NEW_ROW ACTION_REFERENCE_NEW_ROW 253 12 3 N 1 0 45
+def TRIGGERS SQL_MODE SQL_MODE 253 32768 0 N 1 0 45
+def TRIGGERS DEFINER DEFINER 253 308 14 N 1 0 45
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW SQL_MODE DEFINER
NULL test t1_bi INSERT NULL test t1 NULL SET @a = 1 ROW BEFORE NULL NULL OLD NEW root@localhost
----------------------------------------------------------------
SHOW CREATE VIEW v1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def View 253 192 2 N 1 31 33
-def Create View 253 3072 103 N 1 31 33
-def character_set_client 253 96 6 N 1 31 33
-def collation_connection 253 96 6 N 1 31 33
+def View 253 256 2 N 1 31 45
+def Create View 253 4096 103 N 1 31 45
+def character_set_client 253 128 6 N 1 31 45
+def collation_connection 253 128 6 N 1 31 45
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1` binary binary
----------------------------------------------------------------
@@ -1065,27 +1055,27 @@ SELECT *
FROM INFORMATION_SCHEMA.VIEWS
WHERE table_name = 'v1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def VIEWS TABLE_CATALOG TABLE_CATALOG 253 1536 0 Y 0 0 33
-def VIEWS TABLE_SCHEMA TABLE_SCHEMA 253 192 4 N 1 0 33
-def VIEWS TABLE_NAME TABLE_NAME 253 192 2 N 1 0 33
-def VIEWS VIEW_DEFINITION VIEW_DEFINITION 252 589815 15 N 17 0 33
-def VIEWS CHECK_OPTION CHECK_OPTION 253 24 4 N 1 0 33
-def VIEWS IS_UPDATABLE IS_UPDATABLE 253 9 2 N 1 0 33
-def VIEWS DEFINER DEFINER 253 231 14 N 1 0 33
-def VIEWS SECURITY_TYPE SECURITY_TYPE 253 21 7 N 1 0 33
-def VIEWS CHARACTER_SET_CLIENT CHARACTER_SET_CLIENT 253 96 6 N 1 0 33
-def VIEWS COLLATION_CONNECTION COLLATION_CONNECTION 253 96 6 N 1 0 33
+def VIEWS TABLE_CATALOG TABLE_CATALOG 253 2048 0 Y 0 0 45
+def VIEWS TABLE_SCHEMA TABLE_SCHEMA 253 256 4 N 1 0 45
+def VIEWS TABLE_NAME TABLE_NAME 253 256 2 N 1 0 45
+def VIEWS VIEW_DEFINITION VIEW_DEFINITION 252 1048560 15 N 17 0 45
+def VIEWS CHECK_OPTION CHECK_OPTION 253 32 4 N 1 0 45
+def VIEWS IS_UPDATABLE IS_UPDATABLE 253 12 2 N 1 0 45
+def VIEWS DEFINER DEFINER 253 308 14 N 1 0 45
+def VIEWS SECURITY_TYPE SECURITY_TYPE 253 28 7 N 1 0 45
+def VIEWS CHARACTER_SET_CLIENT CHARACTER_SET_CLIENT 253 128 6 N 1 0 45
+def VIEWS COLLATION_CONNECTION COLLATION_CONNECTION 253 128 6 N 1 0 45
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
NULL test v1 select 1 AS `1` NONE NO root@localhost DEFINER binary binary
----------------------------------------------------------------
SHOW CREATE PROCEDURE p1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def Procedure 253 192 2 N 1 31 33
-def sql_mode 253 0 0 N 1 31 33
-def Create Procedure 253 3072 59 Y 0 31 33
-def character_set_client 253 96 6 N 1 31 33
-def collation_connection 253 96 6 N 1 31 33
-def Database Collation 253 96 17 N 1 31 33
+def Procedure 253 256 2 N 1 31 45
+def sql_mode 253 0 0 N 1 31 45
+def Create Procedure 253 4096 59 Y 0 31 45
+def character_set_client 253 128 6 N 1 31 45
+def collation_connection 253 128 6 N 1 31 45
+def Database Collation 253 128 17 N 1 31 45
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
p1 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
SELECT 1 binary binary latin1_swedish_ci
@@ -1112,35 +1102,35 @@ DEFINER
FROM INFORMATION_SCHEMA.ROUTINES
WHERE routine_name = 'p1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def ROUTINES SPECIFIC_NAME SPECIFIC_NAME 253 192 2 N 1 0 33
-def ROUTINES ROUTINE_CATALOG ROUTINE_CATALOG 253 1536 0 Y 0 0 33
-def ROUTINES ROUTINE_SCHEMA ROUTINE_SCHEMA 253 192 4 N 1 0 33
-def ROUTINES ROUTINE_NAME ROUTINE_NAME 253 192 2 N 1 0 33
-def ROUTINES ROUTINE_TYPE ROUTINE_TYPE 253 27 9 N 1 0 33
-def ROUTINES DTD_IDENTIFIER DTD_IDENTIFIER 252 589815 0 Y 16 0 33
-def ROUTINES ROUTINE_BODY ROUTINE_BODY 253 24 3 N 1 0 33
-def ROUTINES ROUTINE_DEFINITION ROUTINE_DEFINITION 252 589815 8 Y 16 0 33
-def ROUTINES EXTERNAL_NAME EXTERNAL_NAME 253 192 0 Y 0 0 33
-def ROUTINES EXTERNAL_LANGUAGE EXTERNAL_LANGUAGE 253 192 0 Y 0 0 33
-def ROUTINES PARAMETER_STYLE PARAMETER_STYLE 253 24 3 N 1 0 33
-def ROUTINES IS_DETERMINISTIC IS_DETERMINISTIC 253 9 2 N 1 0 33
-def ROUTINES SQL_DATA_ACCESS SQL_DATA_ACCESS 253 192 12 N 1 0 33
-def ROUTINES SQL_PATH SQL_PATH 253 192 0 Y 0 0 33
-def ROUTINES SECURITY_TYPE SECURITY_TYPE 253 21 7 N 1 0 33
-def ROUTINES SQL_MODE SQL_MODE 252 589815 0 N 17 0 33
-def ROUTINES ROUTINE_COMMENT ROUTINE_COMMENT 253 192 0 N 1 0 33
-def ROUTINES DEFINER DEFINER 253 231 14 N 1 0 33
+def ROUTINES SPECIFIC_NAME SPECIFIC_NAME 253 256 2 N 1 0 45
+def ROUTINES ROUTINE_CATALOG ROUTINE_CATALOG 253 2048 0 Y 0 0 45
+def ROUTINES ROUTINE_SCHEMA ROUTINE_SCHEMA 253 256 4 N 1 0 45
+def ROUTINES ROUTINE_NAME ROUTINE_NAME 253 256 2 N 1 0 45
+def ROUTINES ROUTINE_TYPE ROUTINE_TYPE 253 36 9 N 1 0 45
+def ROUTINES DTD_IDENTIFIER DTD_IDENTIFIER 252 1048560 0 Y 16 0 45
+def ROUTINES ROUTINE_BODY ROUTINE_BODY 253 32 3 N 1 0 45
+def ROUTINES ROUTINE_DEFINITION ROUTINE_DEFINITION 252 1048560 8 Y 16 0 45
+def ROUTINES EXTERNAL_NAME EXTERNAL_NAME 253 256 0 Y 0 0 45
+def ROUTINES EXTERNAL_LANGUAGE EXTERNAL_LANGUAGE 253 256 0 Y 0 0 45
+def ROUTINES PARAMETER_STYLE PARAMETER_STYLE 253 32 3 N 1 0 45
+def ROUTINES IS_DETERMINISTIC IS_DETERMINISTIC 253 12 2 N 1 0 45
+def ROUTINES SQL_DATA_ACCESS SQL_DATA_ACCESS 253 256 12 N 1 0 45
+def ROUTINES SQL_PATH SQL_PATH 253 256 0 Y 0 0 45
+def ROUTINES SECURITY_TYPE SECURITY_TYPE 253 28 7 N 1 0 45
+def ROUTINES SQL_MODE SQL_MODE 253 32768 0 N 1 0 45
+def ROUTINES ROUTINE_COMMENT ROUTINE_COMMENT 253 256 0 N 1 0 45
+def ROUTINES DEFINER DEFINER 253 308 14 N 1 0 45
SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE SQL_MODE ROUTINE_COMMENT DEFINER
p1 NULL test p1 PROCEDURE NULL SQL SELECT 1 NULL NULL SQL NO CONTAINS SQL NULL DEFINER root@localhost
----------------------------------------------------------------
SHOW CREATE FUNCTION f1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def Function 253 192 2 N 1 31 33
-def sql_mode 253 0 0 N 1 31 33
-def Create Function 253 3072 74 Y 0 31 33
-def character_set_client 253 96 6 N 1 31 33
-def collation_connection 253 96 6 N 1 31 33
-def Database Collation 253 96 17 N 1 31 33
+def Function 253 256 2 N 1 31 45
+def sql_mode 253 0 0 N 1 31 45
+def Create Function 253 4096 74 Y 0 31 45
+def character_set_client 253 128 6 N 1 31 45
+def collation_connection 253 128 6 N 1 31 45
+def Database Collation 253 128 17 N 1 31 45
Function sql_mode Create Function character_set_client collation_connection Database Collation
f1 CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
RETURN 1 binary binary latin1_swedish_ci
@@ -1167,24 +1157,24 @@ DEFINER
FROM INFORMATION_SCHEMA.ROUTINES
WHERE routine_name = 'f1';
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def ROUTINES SPECIFIC_NAME SPECIFIC_NAME 253 192 2 N 1 0 33
-def ROUTINES ROUTINE_CATALOG ROUTINE_CATALOG 253 1536 0 Y 0 0 33
-def ROUTINES ROUTINE_SCHEMA ROUTINE_SCHEMA 253 192 4 N 1 0 33
-def ROUTINES ROUTINE_NAME ROUTINE_NAME 253 192 2 N 1 0 33
-def ROUTINES ROUTINE_TYPE ROUTINE_TYPE 253 27 8 N 1 0 33
-def ROUTINES DTD_IDENTIFIER DTD_IDENTIFIER 252 589815 7 Y 16 0 33
-def ROUTINES ROUTINE_BODY ROUTINE_BODY 253 24 3 N 1 0 33
-def ROUTINES ROUTINE_DEFINITION ROUTINE_DEFINITION 252 589815 8 Y 16 0 33
-def ROUTINES EXTERNAL_NAME EXTERNAL_NAME 253 192 0 Y 0 0 33
-def ROUTINES EXTERNAL_LANGUAGE EXTERNAL_LANGUAGE 253 192 0 Y 0 0 33
-def ROUTINES PARAMETER_STYLE PARAMETER_STYLE 253 24 3 N 1 0 33
-def ROUTINES IS_DETERMINISTIC IS_DETERMINISTIC 253 9 2 N 1 0 33
-def ROUTINES SQL_DATA_ACCESS SQL_DATA_ACCESS 253 192 12 N 1 0 33
-def ROUTINES SQL_PATH SQL_PATH 253 192 0 Y 0 0 33
-def ROUTINES SECURITY_TYPE SECURITY_TYPE 253 21 7 N 1 0 33
-def ROUTINES SQL_MODE SQL_MODE 252 589815 0 N 17 0 33
-def ROUTINES ROUTINE_COMMENT ROUTINE_COMMENT 253 192 0 N 1 0 33
-def ROUTINES DEFINER DEFINER 253 231 14 N 1 0 33
+def ROUTINES SPECIFIC_NAME SPECIFIC_NAME 253 256 2 N 1 0 45
+def ROUTINES ROUTINE_CATALOG ROUTINE_CATALOG 253 2048 0 Y 0 0 45
+def ROUTINES ROUTINE_SCHEMA ROUTINE_SCHEMA 253 256 4 N 1 0 45
+def ROUTINES ROUTINE_NAME ROUTINE_NAME 253 256 2 N 1 0 45
+def ROUTINES ROUTINE_TYPE ROUTINE_TYPE 253 36 8 N 1 0 45
+def ROUTINES DTD_IDENTIFIER DTD_IDENTIFIER 252 1048560 7 Y 16 0 45
+def ROUTINES ROUTINE_BODY ROUTINE_BODY 253 32 3 N 1 0 45
+def ROUTINES ROUTINE_DEFINITION ROUTINE_DEFINITION 252 1048560 8 Y 16 0 45
+def ROUTINES EXTERNAL_NAME EXTERNAL_NAME 253 256 0 Y 0 0 45
+def ROUTINES EXTERNAL_LANGUAGE EXTERNAL_LANGUAGE 253 256 0 Y 0 0 45
+def ROUTINES PARAMETER_STYLE PARAMETER_STYLE 253 32 3 N 1 0 45
+def ROUTINES IS_DETERMINISTIC IS_DETERMINISTIC 253 12 2 N 1 0 45
+def ROUTINES SQL_DATA_ACCESS SQL_DATA_ACCESS 253 256 12 N 1 0 45
+def ROUTINES SQL_PATH SQL_PATH 253 256 0 Y 0 0 45
+def ROUTINES SECURITY_TYPE SECURITY_TYPE 253 28 7 N 1 0 45
+def ROUTINES SQL_MODE SQL_MODE 253 32768 0 N 1 0 45
+def ROUTINES ROUTINE_COMMENT ROUTINE_COMMENT 253 256 0 N 1 0 45
+def ROUTINES DEFINER DEFINER 253 308 14 N 1 0 45
SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE SQL_MODE ROUTINE_COMMENT DEFINER
f1 NULL test f1 FUNCTION int(11) SQL RETURN 1 NULL NULL SQL NO CONTAINS SQL NULL DEFINER root@localhost
----------------------------------------------------------------
@@ -1310,13 +1300,13 @@ Table Non_unique Key_name Seq_in_index C
drop table `mysqlttest\1`.`a\b`;
drop database `mysqlttest\1`;
show engine foobar status;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine foobar logs;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine foobar mutex;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine mutex status;
-ERROR 42000: Unknown table engine 'mutex'
+ERROR 42000: Unknown storage engine 'mutex'
show engine csv status;
Type Name Status
show engine csv logs;
=== modified file 'mysql-test/suite/funcs_1/datadict/is_tables.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc 2008-11-13 08:38:30 +0000
@@ -346,6 +346,7 @@ WHERE table_name = 't1_my_tablex';
# Enforce a time difference bigger than the smallest unit (1 second).
--real_sleep 1.1
INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
SELECT UPDATE_TIME > @UPDATE_TIME
AS "Is current UPDATE_TIME bigger than before last INSERT?"
FROM information_schema.tables
=== modified file 'mysql-test/suite/funcs_1/r/is_character_sets.result'
--- a/mysql-test/suite/funcs_1/r/is_character_sets.result 2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_character_sets.result 2008-11-13 09:50:20 +0000
@@ -28,22 +28,22 @@ DROP FUNCTION test.f1;
#########################################################################
DESCRIBE information_schema.CHARACTER_SETS;
Field Type Null Key Default Extra
-CHARACTER_SET_NAME varchar(64) NO
-DEFAULT_COLLATE_NAME varchar(64) NO
+CHARACTER_SET_NAME varchar(32) NO
+DEFAULT_COLLATE_NAME varchar(32) NO
DESCRIPTION varchar(60) NO
MAXLEN bigint(3) NO 0
SHOW CREATE TABLE information_schema.CHARACTER_SETS;
Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.CHARACTER_SETS;
Field Type Null Key Default Extra
-CHARACTER_SET_NAME varchar(64) NO
-DEFAULT_COLLATE_NAME varchar(64) NO
+CHARACTER_SET_NAME varchar(32) NO
+DEFAULT_COLLATE_NAME varchar(32) NO
DESCRIPTION varchar(60) NO
MAXLEN bigint(3) NO 0
# Testcases 3.2.2.2 and 3.2.2.3 are checked in suite/funcs_1/t/charset_collation*.test
=== modified file 'mysql-test/suite/funcs_1/r/is_collation_charset_applic.result'
--- a/mysql-test/suite/funcs_1/r/is_collation_charset_applic.result 2008-09-11 08:01:28 +0000
+++ b/mysql-test/suite/funcs_1/r/is_collation_charset_applic.result 2008-11-13 11:11:02 +0000
@@ -28,18 +28,18 @@ DROP FUNCTION test.f1;
#########################################################################
DESCRIBE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Field Type Null Key Default Extra
-COLLATION_NAME varchar(64) NO
-CHARACTER_SET_NAME varchar(64) NO
+COLLATION_NAME varchar(32) NO
+CHARACTER_SET_NAME varchar(32) NO
SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Table Create Table
COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
- `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
+ `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT ''
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Field Type Null Key Default Extra
-COLLATION_NAME varchar(64) NO
-CHARACTER_SET_NAME varchar(64) NO
+COLLATION_NAME varchar(32) NO
+CHARACTER_SET_NAME varchar(32) NO
# Testcases 3.2.4.2 and 3.2.4.3 are checked in suite/funcs_1/t/charset_collation*.test
########################################################################
# Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
=== modified file 'mysql-test/suite/funcs_1/r/is_collations.result'
--- a/mysql-test/suite/funcs_1/r/is_collations.result 2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_collations.result 2008-11-13 09:50:20 +0000
@@ -28,8 +28,8 @@ DROP FUNCTION test.f1;
#########################################################################
DESCRIBE information_schema.COLLATIONS;
Field Type Null Key Default Extra
-COLLATION_NAME varchar(64) NO
-CHARACTER_SET_NAME varchar(64) NO
+COLLATION_NAME varchar(32) NO
+CHARACTER_SET_NAME varchar(32) NO
ID bigint(11) NO 0
IS_DEFAULT varchar(3) NO
IS_COMPILED varchar(3) NO
@@ -37,8 +37,8 @@ SORTLEN bigint(3) NO 0
SHOW CREATE TABLE information_schema.COLLATIONS;
Table Create Table
COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` (
- `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+ `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
`ID` bigint(11) NOT NULL DEFAULT '0',
`IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
`IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
@@ -46,8 +46,8 @@ COLLATIONS CREATE TEMPORARY TABLE `COLLA
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLLATIONS;
Field Type Null Key Default Extra
-COLLATION_NAME varchar(64) NO
-CHARACTER_SET_NAME varchar(64) NO
+COLLATION_NAME varchar(32) NO
+CHARACTER_SET_NAME varchar(32) NO
ID bigint(11) NO 0
IS_DEFAULT varchar(3) NO
IS_COMPILED varchar(3) NO
=== modified file 'mysql-test/suite/funcs_1/r/is_columns.result'
--- a/mysql-test/suite/funcs_1/r/is_columns.result 2008-07-04 08:28:36 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns.result 2008-11-13 11:11:02 +0000
@@ -40,8 +40,8 @@ CHARACTER_MAXIMUM_LENGTH bigint(21) unsi
CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL
NUMERIC_PRECISION bigint(21) unsigned YES NULL
NUMERIC_SCALE bigint(21) unsigned YES NULL
-CHARACTER_SET_NAME varchar(64) YES NULL
-COLLATION_NAME varchar(64) YES NULL
+CHARACTER_SET_NAME varchar(32) YES NULL
+COLLATION_NAME varchar(32) YES NULL
COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO
EXTRA varchar(27) NO
@@ -64,8 +64,8 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS`
`CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
`NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
`NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
- `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
- `COLLATION_NAME` varchar(64) DEFAULT NULL,
+ `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
+ `COLLATION_NAME` varchar(32) DEFAULT NULL,
`COLUMN_TYPE` longtext NOT NULL,
`COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
`EXTRA` varchar(27) NOT NULL DEFAULT '',
@@ -88,8 +88,8 @@ CHARACTER_MAXIMUM_LENGTH bigint(21) unsi
CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL
NUMERIC_PRECISION bigint(21) unsigned YES NULL
NUMERIC_SCALE bigint(21) unsigned YES NULL
-CHARACTER_SET_NAME varchar(64) YES NULL
-COLLATION_NAME varchar(64) YES NULL
+CHARACTER_SET_NAME varchar(32) YES NULL
+COLLATION_NAME varchar(32) YES NULL
COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO
EXTRA varchar(27) NO
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-10-09 13:02:56 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-11-13 11:11:02 +0000
@@ -3,22 +3,22 @@ WHERE table_schema = 'information_schema
AND table_name <> 'profiling' AND table_name not LIKE 'falcon_%'
ORDER BY table_schema, table_name, column_name;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT STORAGE FORMAT
-NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+NULL information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema CHARACTER_SETS DESCRIPTION 3 NO varchar 60 240 NULL NULL utf8 utf8_general_ci varchar(60) select Default Default
NULL information_schema CHARACTER_SETS MAXLEN 4 0 NO bigint NULL NULL 19 0 NULL NULL bigint(3) select Default Default
-NULL information_schema COLLATIONS CHARACTER_SET_NAME 2 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema COLLATIONS COLLATION_NAME 1 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema COLLATIONS CHARACTER_SET_NAME 2 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+NULL information_schema COLLATIONS COLLATION_NAME 1 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema COLLATIONS ID 3 0 NO bigint NULL NULL 19 0 NULL NULL bigint(11) select Default Default
NULL information_schema COLLATIONS IS_COMPILED 5 NO varchar 3 12 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
NULL information_schema COLLATIONS IS_DEFAULT 4 NO varchar 3 12 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NULL bigint(3) select Default Default
-NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME 2 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME 2 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema COLUMNS CHARACTER_MAXIMUM_LENGTH 9 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema COLUMNS CHARACTER_OCTET_LENGTH 10 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
-NULL information_schema COLUMNS CHARACTER_SET_NAME 13 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema COLUMNS CHARACTER_SET_NAME 13 NULL YES varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 4096 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS COLUMN_DEFAULT 6 NULL YES longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 12 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
@@ -227,8 +227,8 @@ NULL information_schema ROUTINES SQL_DAT
NULL information_schema ROUTINES SQL_MODE 25 NO varchar 8192 32768 NULL NULL utf8 utf8_general_ci varchar(8192) select Default Default
NULL information_schema ROUTINES SQL_PATH 21 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema SCHEMATA CATALOG_NAME 1 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
-NULL information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+NULL information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema SCHEMATA SCHEMA_NAME 2 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema SCHEMATA SQL_PATH 5 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
NULL information_schema SCHEMA_PRIVILEGES GRANTEE 1 NO varchar 81 324 NULL NULL utf8 utf8_general_ci varchar(81) select Default Default
@@ -270,7 +270,7 @@ NULL information_schema TABLES MAX_DATA_
NULL information_schema TABLES ROW_FORMAT 7 NULL YES varchar 10 40 NULL NULL utf8 utf8_general_ci varchar(10) select Default Default
NULL information_schema TABLES TABLESPACE_NAME 22 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_CATALOG 1 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
-NULL information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
+NULL information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
NULL information_schema TABLES TABLE_COMMENT 21 NO varchar 2048 8192 NULL NULL utf8 utf8_general_ci varchar(2048) select Default Default
NULL information_schema TABLES TABLE_NAME 3 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_ROWS 8 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
@@ -393,18 +393,18 @@ WHERE table_schema = 'information_schema
AND table_name <> 'profiling' AND table_name not LIKE 'falcon_%'
ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION;
COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE
-4.0000 information_schema CHARACTER_SETS CHARACTER_SET_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema CHARACTER_SETS CHARACTER_SET_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
+4.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
4.0000 information_schema CHARACTER_SETS DESCRIPTION varchar 60 240 utf8 utf8_general_ci varchar(60)
NULL information_schema CHARACTER_SETS MAXLEN bigint NULL NULL NULL NULL bigint(3)
-4.0000 information_schema COLLATIONS COLLATION_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema COLLATIONS CHARACTER_SET_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema COLLATIONS COLLATION_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
+4.0000 information_schema COLLATIONS CHARACTER_SET_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
NULL information_schema COLLATIONS ID bigint NULL NULL NULL NULL bigint(11)
4.0000 information_schema COLLATIONS IS_DEFAULT varchar 3 12 utf8 utf8_general_ci varchar(3)
4.0000 information_schema COLLATIONS IS_COMPILED varchar 3 12 utf8 utf8_general_ci varchar(3)
NULL information_schema COLLATIONS SORTLEN bigint NULL NULL NULL NULL bigint(3)
-4.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
+4.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
4.0000 information_schema COLUMNS TABLE_CATALOG varchar 512 2048 utf8 utf8_general_ci varchar(512)
4.0000 information_schema COLUMNS TABLE_SCHEMA varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema COLUMNS TABLE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
@@ -417,8 +417,8 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS CHARACTER_OCTET_LENGTH bigint NULL NULL NULL NULL bigint(21) unsigned
NULL information_schema COLUMNS NUMERIC_PRECISION bigint NULL NULL NULL NULL bigint(21) unsigned
NULL information_schema COLUMNS NUMERIC_SCALE bigint NULL NULL NULL NULL bigint(21) unsigned
-4.0000 information_schema COLUMNS CHARACTER_SET_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema COLUMNS COLLATION_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema COLUMNS CHARACTER_SET_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
+4.0000 information_schema COLUMNS COLLATION_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
4.0000 information_schema COLUMNS COLUMN_KEY varchar 3 12 utf8 utf8_general_ci varchar(3)
4.0000 information_schema COLUMNS EXTRA varchar 27 108 utf8 utf8_general_ci varchar(27)
@@ -618,8 +618,8 @@ NULL information_schema ROUTINES LAST_AL
4.0000 information_schema ROUTINES DATABASE_COLLATION varchar 32 128 utf8 utf8_general_ci varchar(32)
4.0000 information_schema SCHEMATA CATALOG_NAME varchar 512 2048 utf8 utf8_general_ci varchar(512)
4.0000 information_schema SCHEMATA SCHEMA_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
-4.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
+4.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 32 128 utf8 utf8_general_ci varchar(32)
4.0000 information_schema SCHEMATA SQL_PATH varchar 512 2048 utf8 utf8_general_ci varchar(512)
4.0000 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 81 324 utf8 utf8_general_ci varchar(81)
4.0000 information_schema SCHEMA_PRIVILEGES TABLE_CATALOG varchar 512 2048 utf8 utf8_general_ci varchar(512)
@@ -663,7 +663,7 @@ NULL information_schema TABLES AUTO_INCR
NULL information_schema TABLES CREATE_TIME datetime NULL NULL NULL NULL datetime
NULL information_schema TABLES UPDATE_TIME datetime NULL NULL NULL NULL datetime
NULL information_schema TABLES CHECK_TIME datetime NULL NULL NULL NULL datetime
-4.0000 information_schema TABLES TABLE_COLLATION varchar 64 256 utf8 utf8_general_ci varchar(64)
+4.0000 information_schema TABLES TABLE_COLLATION varchar 32 128 utf8 utf8_general_ci varchar(32)
NULL information_schema TABLES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned
4.0000 information_schema TABLES CREATE_OPTIONS varchar 255 1020 utf8 utf8_general_ci varchar(255)
4.0000 information_schema TABLES TABLE_COMMENT varchar 2048 8192 utf8 utf8_general_ci varchar(2048)
=== modified file 'mysql-test/suite/funcs_1/r/is_schemata.result'
--- a/mysql-test/suite/funcs_1/r/is_schemata.result 2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_schemata.result 2008-11-13 09:50:20 +0000
@@ -30,24 +30,24 @@ DESCRIBE information_schema.SCH
Field Type Null Key Default Extra
CATALOG_NAME varchar(512) YES NULL
SCHEMA_NAME varchar(64) NO
-DEFAULT_CHARACTER_SET_NAME varchar(64) NO
-DEFAULT_COLLATION_NAME varchar(64) NO
+DEFAULT_CHARACTER_SET_NAME varchar(32) NO
+DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
SHOW CREATE TABLE information_schema.SCHEMATA;
Table Create Table
SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`CATALOG_NAME` varchar(512) DEFAULT NULL,
`SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+ `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
`SQL_PATH` varchar(512) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra
CATALOG_NAME varchar(512) YES NULL
SCHEMA_NAME varchar(64) NO
-DEFAULT_CHARACTER_SET_NAME varchar(64) NO
-DEFAULT_COLLATION_NAME varchar(64) NO
+DEFAULT_CHARACTER_SET_NAME varchar(32) NO
+DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
SELECT catalog_name, schema_name, sql_path
FROM information_schema.schemata
=== modified file 'mysql-test/suite/funcs_1/r/is_tables.result'
--- a/mysql-test/suite/funcs_1/r/is_tables.result 2008-09-23 08:39:48 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables.result 2008-11-13 11:11:02 +0000
@@ -45,7 +45,7 @@ AUTO_INCREMENT bigint(21) unsigned YES
CREATE_TIME datetime YES NULL
UPDATE_TIME datetime YES NULL
CHECK_TIME datetime YES NULL
-TABLE_COLLATION varchar(64) YES NULL
+TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
TABLE_COMMENT varchar(2048) NO
@@ -70,7 +70,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`CREATE_TIME` datetime DEFAULT NULL,
`UPDATE_TIME` datetime DEFAULT NULL,
`CHECK_TIME` datetime DEFAULT NULL,
- `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+ `TABLE_COLLATION` varchar(32) DEFAULT NULL,
`CHECKSUM` bigint(21) unsigned DEFAULT NULL,
`CREATE_OPTIONS` varchar(255) DEFAULT NULL,
`TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
@@ -95,7 +95,7 @@ AUTO_INCREMENT bigint(21) unsigned YES
CREATE_TIME datetime YES NULL
UPDATE_TIME datetime YES NULL
CHECK_TIME datetime YES NULL
-TABLE_COLLATION varchar(64) YES NULL
+TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
TABLE_COMMENT varchar(2048) NO
@@ -314,6 +314,7 @@ SELECT UPDATE_TIME, checksum INTO @UPDAT
FROM information_schema.tables
WHERE table_name = 't1_my_tablex';
INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
SELECT UPDATE_TIME > @UPDATE_TIME
AS "Is current UPDATE_TIME bigger than before last INSERT?"
FROM information_schema.tables
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-11-07 11:45:16 +0000
+++ b/mysql-test/t/disabled.def 2008-11-13 11:11:02 +0000
@@ -12,7 +12,6 @@
innodb : WL#1213: Waiting for InnoDB team to add support for 4-byte character sets.
concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
federated_transactions : Bug#29523 Transactions do not work
-show_check : Bug #32682 Test show_check fails in 6.0
lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
ctype_create : Bug#32965 main.ctype_create fails
=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test 2008-08-15 21:14:52 +0000
+++ b/mysql-test/t/show_check.test 2008-11-13 11:11:02 +0000
@@ -544,17 +544,12 @@ SHOW CREATE VIEW v1;
DROP VIEW v1;
# Check that SQL_NO_CACHE always wins.
+--error ER_WRONG_USAGE
CREATE VIEW v1 AS SELECT SQL_CACHE SQL_NO_CACHE NOW();
-SHOW CREATE VIEW v1;
-DROP VIEW v1;
-
+--error ER_WRONG_USAGE
CREATE VIEW v1 AS SELECT SQL_NO_CACHE SQL_CACHE NOW();
-SHOW CREATE VIEW v1;
-DROP VIEW v1;
-
+--error ER_WRONG_USAGE
CREATE VIEW v1 AS SELECT SQL_CACHE SQL_NO_CACHE SQL_CACHE NOW();
-SHOW CREATE VIEW v1;
-DROP VIEW v1;
# Check CREATE VIEW in a prepared statement in a procedure.
delimiter |;
@@ -622,7 +617,6 @@ show plugins;
show columns in t1;
show slave hosts;
show keys in t1;
-show column types;
show storage engines;
show authors;
show contributors;
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc 2008-11-06 18:39:27 +0000
+++ b/sql/sql_show.cc 2008-11-13 11:11:02 +0000
@@ -6416,9 +6416,10 @@ ST_FIELD_INFO schema_fields_info[]=
{"CATALOG_NAME", FN_REFLEN, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE},
{"SCHEMA_NAME", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 0, "Database",
SKIP_OPEN_TABLE},
- {"DEFAULT_CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0,
+ {"DEFAULT_CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, 0,
+ SKIP_OPEN_TABLE},
+ {"DEFAULT_COLLATION_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, 0,
SKIP_OPEN_TABLE},
- {"DEFAULT_COLLATION_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
{"SQL_PATH", FN_REFLEN, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
};
@@ -6452,7 +6453,8 @@ ST_FIELD_INFO tables_fields_info[]=
{"CREATE_TIME", 0, MYSQL_TYPE_DATETIME, 0, 1, "Create_time", OPEN_FULL_TABLE},
{"UPDATE_TIME", 0, MYSQL_TYPE_DATETIME, 0, 1, "Update_time", OPEN_FULL_TABLE},
{"CHECK_TIME", 0, MYSQL_TYPE_DATETIME, 0, 1, "Check_time", OPEN_FULL_TABLE},
- {"TABLE_COLLATION", 64, MYSQL_TYPE_STRING, 0, 1, "Collation", OPEN_FRM_ONLY},
+ {"TABLE_COLLATION", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 1, "Collation",
+ OPEN_FRM_ONLY},
{"CHECKSUM", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
(MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), "Checksum", OPEN_FULL_TABLE},
{"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options",
@@ -6484,8 +6486,10 @@ ST_FIELD_INFO columns_fields_info[]=
0, (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), 0, OPEN_FRM_ONLY},
{"NUMERIC_SCALE", MY_INT64_NUM_DECIMAL_DIGITS , MYSQL_TYPE_LONGLONG,
0, (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), 0, OPEN_FRM_ONLY},
- {"CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 1, 0, OPEN_FRM_ONLY},
- {"COLLATION_NAME", 64, MYSQL_TYPE_STRING, 0, 1, "Collation", OPEN_FRM_ONLY},
+ {"CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 1, 0,
+ OPEN_FRM_ONLY},
+ {"COLLATION_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 1, "Collation",
+ OPEN_FRM_ONLY},
{"COLUMN_TYPE", 65535, MYSQL_TYPE_STRING, 0, 0, "Type", OPEN_FRM_ONLY},
{"COLUMN_KEY", 3, MYSQL_TYPE_STRING, 0, 0, "Key", OPEN_FRM_ONLY},
{"EXTRA", 27, MYSQL_TYPE_STRING, 0, 0, "Extra", OPEN_FRM_ONLY},
@@ -6499,10 +6503,10 @@ ST_FIELD_INFO columns_fields_info[]=
ST_FIELD_INFO charsets_fields_info[]=
{
- {"CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 0, "Charset",
- SKIP_OPEN_TABLE},
- {"DEFAULT_COLLATE_NAME", 64, MYSQL_TYPE_STRING, 0, 0, "Default collation",
+ {"CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, "Charset",
SKIP_OPEN_TABLE},
+ {"DEFAULT_COLLATE_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0,
+ "Default collation", SKIP_OPEN_TABLE},
{"DESCRIPTION", 60, MYSQL_TYPE_STRING, 0, 0, "Description",
SKIP_OPEN_TABLE},
{"MAXLEN", 3, MYSQL_TYPE_LONGLONG, 0, 0, "Maxlen", SKIP_OPEN_TABLE},
@@ -6512,8 +6516,9 @@ ST_FIELD_INFO charsets_fields_info[]=
ST_FIELD_INFO collation_fields_info[]=
{
- {"COLLATION_NAME", 64, MYSQL_TYPE_STRING, 0, 0, "Collation", SKIP_OPEN_TABLE},
- {"CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 0, "Charset",
+ {"COLLATION_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, "Collation",
+ SKIP_OPEN_TABLE},
+ {"CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, "Charset",
SKIP_OPEN_TABLE},
{"ID", MY_INT32_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0, 0, "Id",
SKIP_OPEN_TABLE},
@@ -6576,8 +6581,10 @@ ST_FIELD_INFO events_fields_info[]=
ST_FIELD_INFO coll_charset_app_fields_info[]=
{
- {"COLLATION_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
- {"CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
+ {"COLLATION_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, 0,
+ SKIP_OPEN_TABLE},
+ {"CHARACTER_SET_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, 0,
+ SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
};
| Thread |
|---|
| • bzr push into mysql-6.0 branch (Sergey.Glukhov:2922 to 2924) Bug#35789 | Sergey Glukhov | 13 Nov |
