MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Glukhov Date:October 9 2008 12:10pm
Subject:bzr commit into mysql-5.1 branch (Sergey.Glukhov:2773) Bug#29153
View as plain text  
#At file:///home/gluh/MySQL/mysql-5.1-bugteam/

 2773 Sergey Glukhov	2008-10-09
      Bug#29153 SHOW and INFORMATION_SCHEMA commands increment Created_tmp_disk_tables
      TRIGGERS.SQL_MODE, EVENTS.SQL_MODE, TRIGGERS.DEFINER:
      field type is changed to VARCHAR.
modified:
  mysql-test/r/information_schema.result
  mysql-test/r/show_check.result
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_events.result
  mysql-test/suite/funcs_1/r/is_triggers.result
  sql/sql_show.cc

per-file messages:
  mysql-test/r/information_schema.result
    result fix
  mysql-test/r/show_check.result
    result fix
  mysql-test/suite/funcs_1/r/is_columns_is.result
    result fix
  mysql-test/suite/funcs_1/r/is_events.result
    result fix
  mysql-test/suite/funcs_1/r/is_triggers.result
    result fix
  sql/sql_show.cc
    TRIGGERS.SQL_MODE, EVENTS.SQL_MODE, TRIGGERS.DEFINER:
    field type is changed to VARCHAR.
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2008-10-09 07:50:29 +0000
+++ b/mysql-test/r/information_schema.result	2008-10-09 12:09:30 +0000
@@ -758,7 +758,6 @@ table_schema	table_name	column_name
 information_schema	COLUMNS	COLUMN_DEFAULT
 information_schema	COLUMNS	COLUMN_TYPE
 information_schema	EVENTS	EVENT_DEFINITION
-information_schema	EVENTS	SQL_MODE
 information_schema	PARTITIONS	PARTITION_EXPRESSION
 information_schema	PARTITIONS	SUBPARTITION_EXPRESSION
 information_schema	PARTITIONS	PARTITION_DESCRIPTION
@@ -768,8 +767,6 @@ information_schema	ROUTINES	ROUTINE_DEFI
 information_schema	ROUTINES	SQL_MODE
 information_schema	TRIGGERS	ACTION_CONDITION
 information_schema	TRIGGERS	ACTION_STATEMENT
-information_schema	TRIGGERS	SQL_MODE
-information_schema	TRIGGERS	DEFINER
 information_schema	VIEWS	VIEW_DEFINITION
 select table_name, column_name, data_type from information_schema.columns
 where data_type = 'datetime';

=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2008-08-15 20:42:29 +0000
+++ b/mysql-test/r/show_check.result	2008-10-09 12:09:30 +0000
@@ -1001,8 +1001,8 @@ def			TRIGGERS	EVENT_OBJECT_TABLE	Table	
 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	CREATED	Created	12	19	0	Y	128	0	63
-def			TRIGGERS	SQL_MODE	sql_mode	252	589815	0	N	17	0	33
-def			TRIGGERS	DEFINER	Definer	252	589815	14	N	17	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	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
@@ -1045,8 +1045,8 @@ def			TRIGGERS	ACTION_REFERENCE_OLD_TABL
 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	252	589815	0	N	17	0	33
-def			TRIGGERS	DEFINER	DEFINER	252	589815	14	N	17	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
 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
 ----------------------------------------------------------------

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2008-04-01 17:22:37 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2008-10-09 12:09:30 +0000
@@ -67,7 +67,7 @@ NULL	information_schema	EVENTS	LAST_ALTE
 NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
 NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
-NULL	information_schema	EVENTS	SQL_MODE	12	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	SQL_MODE	12		NO	varchar	8192	24576	NULL	NULL	utf8	utf8_general_ci	varchar(8192)			select	
 NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
 NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -277,12 +277,12 @@ NULL	information_schema	TRIGGERS	CHARACT
 NULL	information_schema	TRIGGERS	COLLATION_CONNECTION	21		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	TRIGGERS	CREATED	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TRIGGERS	DATABASE_COLLATION	22		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
-NULL	information_schema	TRIGGERS	DEFINER	19	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	TRIGGERS	DEFINER	19		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
 NULL	information_schema	TRIGGERS	EVENT_MANIPULATION	4		NO	varchar	6	18	NULL	NULL	utf8	utf8_general_ci	varchar(6)			select	
 NULL	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TRIGGERS	SQL_MODE	18	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	TRIGGERS	SQL_MODE	18		NO	varchar	8192	24576	NULL	NULL	utf8	utf8_general_ci	varchar(8192)			select	
 NULL	information_schema	TRIGGERS	TRIGGER_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	TRIGGERS	TRIGGER_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TRIGGERS	TRIGGER_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -412,7 +412,7 @@ NULL	information_schema	COLUMNS	NUMERIC_
 NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
 3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
-1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	EVENTS	SQL_MODE	varchar	8192	24576	utf8	utf8_general_ci	varchar(8192)
 NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
@@ -635,8 +635,8 @@ NULL	information_schema	TRIGGERS	ACTION_
 3.0000	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 NULL	information_schema	TRIGGERS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
-1.0000	information_schema	TRIGGERS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-1.0000	information_schema	TRIGGERS	DEFINER	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	TRIGGERS	SQL_MODE	varchar	8192	24576	utf8	utf8_general_ci	varchar(8192)
+3.0000	information_schema	TRIGGERS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
 3.0000	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	TRIGGERS	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	TRIGGERS	DATABASE_COLLATION	varchar	32	96	utf8	utf8_general_ci	varchar(32)

=== modified file 'mysql-test/suite/funcs_1/r/is_events.result'
--- a/mysql-test/suite/funcs_1/r/is_events.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_events.result	2008-10-09 12:09:30 +0000
@@ -39,7 +39,7 @@ EVENT_TYPE	varchar(9)	NO			
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	
 INTERVAL_FIELD	varchar(18)	YES		NULL	
-SQL_MODE	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
 STARTS	datetime	YES		NULL	
 ENDS	datetime	YES		NULL	
 STATUS	varchar(18)	NO			
@@ -66,7 +66,7 @@ EVENTS	CREATE TEMPORARY TABLE `EVENTS` (
   `EXECUTE_AT` datetime DEFAULT NULL,
   `INTERVAL_VALUE` varchar(256) DEFAULT NULL,
   `INTERVAL_FIELD` varchar(18) DEFAULT NULL,
-  `SQL_MODE` longtext NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
   `STARTS` datetime DEFAULT NULL,
   `ENDS` datetime DEFAULT NULL,
   `STATUS` varchar(18) NOT NULL DEFAULT '',
@@ -93,7 +93,7 @@ EVENT_TYPE	varchar(9)	NO			
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	
 INTERVAL_FIELD	varchar(18)	YES		NULL	
-SQL_MODE	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
 STARTS	datetime	YES		NULL	
 ENDS	datetime	YES		NULL	
 STATUS	varchar(18)	NO			

=== modified file 'mysql-test/suite/funcs_1/r/is_triggers.result'
--- a/mysql-test/suite/funcs_1/r/is_triggers.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result	2008-10-09 12:09:30 +0000
@@ -45,8 +45,8 @@ ACTION_REFERENCE_NEW_TABLE	varchar(64)	Y
 ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
 ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
 CREATED	datetime	YES		NULL	
-SQL_MODE	longtext	NO		NULL	
-DEFINER	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
+DEFINER	varchar(77)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
 COLLATION_CONNECTION	varchar(32)	NO			
 DATABASE_COLLATION	varchar(32)	NO			
@@ -70,8 +70,8 @@ TRIGGERS	CREATE TEMPORARY TABLE `TRIGGER
   `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
   `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
   `CREATED` datetime DEFAULT NULL,
-  `SQL_MODE` longtext NOT NULL,
-  `DEFINER` longtext NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
   `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
@@ -95,8 +95,8 @@ ACTION_REFERENCE_NEW_TABLE	varchar(64)	Y
 ACTION_REFERENCE_OLD_ROW	varchar(3)	NO			
 ACTION_REFERENCE_NEW_ROW	varchar(3)	NO			
 CREATED	datetime	YES		NULL	
-SQL_MODE	longtext	NO		NULL	
-DEFINER	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
+DEFINER	varchar(77)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
 COLLATION_CONNECTION	varchar(32)	NO			
 DATABASE_COLLATION	varchar(32)	NO			

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2008-10-09 07:50:29 +0000
+++ b/sql/sql_show.cc	2008-10-09 12:09:30 +0000
@@ -6126,7 +6126,7 @@ ST_FIELD_INFO events_fields_info[]=
    SKIP_OPEN_TABLE},
   {"INTERVAL_FIELD", 18, MYSQL_TYPE_STRING, 0, 1, "Interval field",
    SKIP_OPEN_TABLE},
-  {"SQL_MODE", 65535, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
+  {"SQL_MODE", 32*256, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
   {"STARTS", 0, MYSQL_TYPE_DATETIME, 0, 1, "Starts", SKIP_OPEN_TABLE},
   {"ENDS", 0, MYSQL_TYPE_DATETIME, 0, 1, "Ends", SKIP_OPEN_TABLE},
   {"STATUS", 18, MYSQL_TYPE_STRING, 0, 0, "Status", SKIP_OPEN_TABLE},
@@ -6369,8 +6369,8 @@ ST_FIELD_INFO triggers_fields_info[]=
   {"ACTION_REFERENCE_OLD_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0, OPEN_FULL_TABLE},
   {"ACTION_REFERENCE_NEW_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0, OPEN_FULL_TABLE},
   {"CREATED", 0, MYSQL_TYPE_DATETIME, 0, 1, "Created", OPEN_FULL_TABLE},
-  {"SQL_MODE", 65535, MYSQL_TYPE_STRING, 0, 0, "sql_mode", OPEN_FULL_TABLE},
-  {"DEFINER", 65535, MYSQL_TYPE_STRING, 0, 0, "Definer", OPEN_FULL_TABLE},
+  {"SQL_MODE", 32*256, MYSQL_TYPE_STRING, 0, 0, "sql_mode", OPEN_FULL_TABLE},
+  {"DEFINER", 77, MYSQL_TYPE_STRING, 0, 0, "Definer", OPEN_FULL_TABLE},
   {"CHARACTER_SET_CLIENT", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0,
    "character_set_client", OPEN_FULL_TABLE},
   {"COLLATION_CONNECTION", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0,

Thread
bzr commit into mysql-5.1 branch (Sergey.Glukhov:2773) Bug#29153Sergey Glukhov9 Oct