Skip to content

M
MariaDB
Commit da37bfd8 authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT 

Removing DEFAULT from INFORMATION_SCHEMA columns.
DEFAULT in read-only tables is rather meaningless.
Upgrade should go smoothly.

Also fixes:
 MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
parent 466d8170
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2063 additions and 1967 deletions
mysql-test/main/create.result
View file @ da37bfd8
...@@ -1161,58 +1161,58 @@ create table t1 like information_schema.processlist; ...@@ -1161,58 +1161,58 @@ create table t1 like information_schema.processlist;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
drop table t1; drop table t1;
create temporary table t1 like information_schema.processlist; create temporary table t1 like information_schema.processlist;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TEMPORARY TABLE `t1` ( t1 CREATE TEMPORARY TABLE `t1` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
drop table t1; drop table t1;
create table t1 like information_schema.character_sets; create table t1 like information_schema.character_sets;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '', `DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL DEFAULT 0 `MAXLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
drop table t1; drop table t1;
......
mysql-test/main/gis.result
View file @ da37bfd8
...@@ -1746,27 +1746,27 @@ drop table t1; ...@@ -1746,27 +1746,27 @@ drop table t1;
SHOW CREATE TABLE information_schema.geometry_columns; SHOW CREATE TABLE information_schema.geometry_columns;
Table Create Table Table Create Table
GEOMETRY_COLUMNS CREATE TEMPORARY TABLE `GEOMETRY_COLUMNS` ( GEOMETRY_COLUMNS CREATE TEMPORARY TABLE `GEOMETRY_COLUMNS` (
`F_TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `F_TABLE_CATALOG` varchar(512) NOT NULL,
`F_TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `F_TABLE_SCHEMA` varchar(64) NOT NULL,
`F_TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `F_TABLE_NAME` varchar(64) NOT NULL,
`F_GEOMETRY_COLUMN` varchar(64) NOT NULL DEFAULT '', `F_GEOMETRY_COLUMN` varchar(64) NOT NULL,
`G_TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `G_TABLE_CATALOG` varchar(512) NOT NULL,
`G_TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `G_TABLE_SCHEMA` varchar(64) NOT NULL,
`G_TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `G_TABLE_NAME` varchar(64) NOT NULL,
`G_GEOMETRY_COLUMN` varchar(64) NOT NULL DEFAULT '', `G_GEOMETRY_COLUMN` varchar(64) NOT NULL,
`STORAGE_TYPE` tinyint(2) NOT NULL DEFAULT 0, `STORAGE_TYPE` tinyint(2) NOT NULL,
`GEOMETRY_TYPE` int(7) NOT NULL DEFAULT 0, `GEOMETRY_TYPE` int(7) NOT NULL,
`COORD_DIMENSION` tinyint(2) NOT NULL DEFAULT 0, `COORD_DIMENSION` tinyint(2) NOT NULL,
`MAX_PPR` tinyint(2) NOT NULL DEFAULT 0, `MAX_PPR` tinyint(2) NOT NULL,
`SRID` smallint(5) NOT NULL DEFAULT 0 `SRID` smallint(5) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW CREATE TABLE information_schema.spatial_ref_sys; SHOW CREATE TABLE information_schema.spatial_ref_sys;
Table Create Table Table Create Table
SPATIAL_REF_SYS CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` ( SPATIAL_REF_SYS CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
`SRID` smallint(5) NOT NULL DEFAULT 0, `SRID` smallint(5) NOT NULL,
`AUTH_NAME` varchar(512) NOT NULL DEFAULT '', `AUTH_NAME` varchar(512) NOT NULL,
`AUTH_SRID` int(5) NOT NULL DEFAULT 0, `AUTH_SRID` int(5) NOT NULL,
`SRTEXT` varchar(2048) NOT NULL DEFAULT '' `SRTEXT` varchar(2048) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
create table t1(g GEOMETRY, pt POINT); create table t1(g GEOMETRY, pt POINT);
create table t2(g LINESTRING, pl POLYGON); create table t2(g LINESTRING, pl POLYGON);
......
mysql-test/main/information_schema.result
View file @ da37bfd8
...@@ -226,7 +226,7 @@ Field Type Collation Null Key Default Extra Privileges Comment ...@@ -226,7 +226,7 @@ Field Type Collation Null Key Default Extra Privileges Comment
Insert_priv enum('N','Y') utf8_general_ci NO N select,insert,update,references Insert_priv enum('N','Y') utf8_general_ci NO N select,insert,update,references
show full columns from v1; show full columns from v1;
Field Type Collation Null Key Default Extra Privileges Comment Field Type Collation Null Key Default Extra Privileges Comment
c varchar(64) utf8_general_ci NO select,insert,update,references c varchar(64) utf8_general_ci NO NULL select,insert,update,references
select * from information_schema.COLUMNS where table_name="t1" select * from information_schema.COLUMNS where table_name="t1"
and column_name= "a"; and column_name= "a";
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 DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION 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 DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION
...@@ -600,19 +600,19 @@ drop table t1; ...@@ -600,19 +600,19 @@ drop table t1;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` ( CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '', `DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL DEFAULT 0 `MAXLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
set names latin2; set names latin2;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` ( CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '', `DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL DEFAULT 0 `MAXLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
set names latin1; set names latin1;
create table t1 select * from information_schema.CHARACTER_SETS create table t1 select * from information_schema.CHARACTER_SETS
...@@ -624,10 +624,10 @@ alter table t1 default character set utf8; ...@@ -624,10 +624,10 @@ alter table t1 default character set utf8;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '', `DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL DEFAULT 0 `MAXLEN` bigint(3) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
drop table t1; drop table t1;
create view v1 as select * from information_schema.TABLES; create view v1 as select * from information_schema.TABLES;
...@@ -2345,5 +2345,30 @@ select * from t1 where (name, len) in (select name, len from information_schema ...@@ -2345,5 +2345,30 @@ select * from t1 where (name, len) in (select name, len from information_schema
name len name len
drop table t1; drop table t1;
# #
# MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
#
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE OR REPLACE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
SHOW returned: CREATE TABLE `t1` (
`TABLE_NAME` varchar(64) CHARACTER SET utf8 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE TABLE `t1` (
`TABLE_NAME` varchar(64) CHARACTER SET utf8 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`TABLE_NAME` varchar(64) CHARACTER SET utf8 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
SET SQL_MODE=DEFAULT;
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE OR REPLACE TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
DROP TABLE t1;
# Executing the statement returned from SHOW CREATE TABLE
DROP TABLE t1;
SET SQL_MODE=DEFAULT;
#
# End of 10.3 tests # End of 10.3 tests
# #
mysql-test/main/information_schema.test
View file @ da37bfd8
...@@ -2073,6 +2073,39 @@ create table t1 ( name varchar(64) character set utf8, len int); ...@@ -2073,6 +2073,39 @@ create table t1 ( name varchar(64) character set utf8, len int);
select * from t1 where (name, len) in (select name, len from information_schema.innodb_sys_columns having len = 8); select * from t1 where (name, len) in (select name, len from information_schema.innodb_sys_columns having len = 8);
drop table t1; drop table t1;
--echo #
--echo # MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
--echo #
# Test one column with detailed output
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE OR REPLACE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
--let $myvar= query_get_value(SHOW CREATE TABLE test.t1, Create Table, 1)
--echo SHOW returned: $myvar
DROP TABLE t1;
--eval $myvar
SHOW CREATE TABLE t1;
DROP TABLE t1;
SET SQL_MODE=DEFAULT;
# Test all columns without detailed output.
# Just make sure the SHOW CREATE TABLE result
# can be passed back to the server without errors.
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE OR REPLACE TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
--let $myvar= query_get_value(SHOW CREATE TABLE test.t1, Create Table, 1)
DROP TABLE t1;
--disable_query_log
--echo # Executing the statement returned from SHOW CREATE TABLE
--eval $myvar
--enable_query_log
DROP TABLE t1;
SET SQL_MODE=DEFAULT;
--echo # --echo #
--echo # End of 10.3 tests --echo # End of 10.3 tests
--echo # --echo #
mysql-test/main/information_schema_parameters.result
View file @ da37bfd8
...@@ -3,22 +3,22 @@ USE INFORMATION_SCHEMA; ...@@ -3,22 +3,22 @@ USE INFORMATION_SCHEMA;
SHOW CREATE TABLE INFORMATION_SCHEMA.PARAMETERS; SHOW CREATE TABLE INFORMATION_SCHEMA.PARAMETERS;
Table Create Table Table Create Table
PARAMETERS CREATE TEMPORARY TABLE `PARAMETERS` ( PARAMETERS CREATE TEMPORARY TABLE `PARAMETERS` (
`SPECIFIC_CATALOG` varchar(512) NOT NULL DEFAULT '', `SPECIFIC_CATALOG` varchar(512) NOT NULL,
`SPECIFIC_SCHEMA` varchar(64) NOT NULL DEFAULT '', `SPECIFIC_SCHEMA` varchar(64) NOT NULL,
`SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '', `SPECIFIC_NAME` varchar(64) NOT NULL,
`ORDINAL_POSITION` int(21) NOT NULL DEFAULT 0, `ORDINAL_POSITION` int(21) NOT NULL,
`PARAMETER_MODE` varchar(5) DEFAULT NULL, `PARAMETER_MODE` varchar(5),
`PARAMETER_NAME` varchar(64) DEFAULT NULL, `PARAMETER_NAME` varchar(64),
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `DATA_TYPE` varchar(64) NOT NULL,
`CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL, `CHARACTER_MAXIMUM_LENGTH` int(21),
`CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL, `CHARACTER_OCTET_LENGTH` int(21),
`NUMERIC_PRECISION` int(21) DEFAULT NULL, `NUMERIC_PRECISION` int(21),
`NUMERIC_SCALE` int(21) DEFAULT NULL, `NUMERIC_SCALE` int(21),
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL, `DATETIME_PRECISION` bigint(21) unsigned,
`CHARACTER_SET_NAME` varchar(64) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(64),
`COLLATION_NAME` varchar(64) DEFAULT NULL, `COLLATION_NAME` varchar(64),
`DTD_IDENTIFIER` longtext NOT NULL DEFAULT '', `DTD_IDENTIFIER` longtext NOT NULL,
`ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '' `ROUTINE_TYPE` varchar(9) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema' WHERE table_schema = 'information_schema'
...@@ -29,7 +29,7 @@ TABLE_SCHEMA information_schema ...@@ -29,7 +29,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME SPECIFIC_CATALOG COLUMN_NAME SPECIFIC_CATALOG
ORDINAL_POSITION 1 ORDINAL_POSITION 1
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 512 CHARACTER_MAXIMUM_LENGTH 512
...@@ -51,7 +51,7 @@ TABLE_SCHEMA information_schema ...@@ -51,7 +51,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME SPECIFIC_SCHEMA COLUMN_NAME SPECIFIC_SCHEMA
ORDINAL_POSITION 2 ORDINAL_POSITION 2
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -73,7 +73,7 @@ TABLE_SCHEMA information_schema ...@@ -73,7 +73,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME SPECIFIC_NAME COLUMN_NAME SPECIFIC_NAME
ORDINAL_POSITION 3 ORDINAL_POSITION 3
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -95,7 +95,7 @@ TABLE_SCHEMA information_schema ...@@ -95,7 +95,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME ORDINAL_POSITION COLUMN_NAME ORDINAL_POSITION
ORDINAL_POSITION 4 ORDINAL_POSITION 4
COLUMN_DEFAULT 0 COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE int DATA_TYPE int
CHARACTER_MAXIMUM_LENGTH NULL CHARACTER_MAXIMUM_LENGTH NULL
...@@ -161,7 +161,7 @@ TABLE_SCHEMA information_schema ...@@ -161,7 +161,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME DATA_TYPE COLUMN_NAME DATA_TYPE
ORDINAL_POSITION 7 ORDINAL_POSITION 7
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -337,7 +337,7 @@ TABLE_SCHEMA information_schema ...@@ -337,7 +337,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME DTD_IDENTIFIER COLUMN_NAME DTD_IDENTIFIER
ORDINAL_POSITION 15 ORDINAL_POSITION 15
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE longtext DATA_TYPE longtext
CHARACTER_MAXIMUM_LENGTH 4294967295 CHARACTER_MAXIMUM_LENGTH 4294967295
...@@ -359,7 +359,7 @@ TABLE_SCHEMA information_schema ...@@ -359,7 +359,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME PARAMETERS TABLE_NAME PARAMETERS
COLUMN_NAME ROUTINE_TYPE COLUMN_NAME ROUTINE_TYPE
ORDINAL_POSITION 16 ORDINAL_POSITION 16
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 9 CHARACTER_MAXIMUM_LENGTH 9
...@@ -378,13 +378,13 @@ IS_GENERATED NEVER ...@@ -378,13 +378,13 @@ IS_GENERATED NEVER
GENERATION_EXPRESSION NULL GENERATION_EXPRESSION NULL
DESCRIBE INFORMATION_SCHEMA.PARAMETERS; DESCRIBE INFORMATION_SCHEMA.PARAMETERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_CATALOG varchar(512) NO SPECIFIC_CATALOG varchar(512) NO NULL
SPECIFIC_SCHEMA varchar(64) NO SPECIFIC_SCHEMA varchar(64) NO NULL
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ORDINAL_POSITION int(21) NO 0 ORDINAL_POSITION int(21) NO NULL
PARAMETER_MODE varchar(5) YES NULL PARAMETER_MODE varchar(5) YES NULL
PARAMETER_NAME varchar(64) YES NULL PARAMETER_NAME varchar(64) YES NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -392,8 +392,8 @@ NUMERIC_SCALE int(21) YES NULL ...@@ -392,8 +392,8 @@ NUMERIC_SCALE int(21) YES NULL
DATETIME_PRECISION bigint(21) unsigned YES NULL DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext NO DTD_IDENTIFIER longtext NO NULL
ROUTINE_TYPE varchar(9) NO ROUTINE_TYPE varchar(9) NO NULL
# ========== parameters.2 ========== # ========== parameters.2 ==========
DROP DATABASE IF EXISTS i_s_parameters_test; DROP DATABASE IF EXISTS i_s_parameters_test;
CREATE DATABASE i_s_parameters_test; CREATE DATABASE i_s_parameters_test;
......
mysql-test/main/information_schema_routines.result
View file @ da37bfd8
...@@ -5,37 +5,37 @@ USE INFORMATION_SCHEMA; ...@@ -5,37 +5,37 @@ USE INFORMATION_SCHEMA;
SHOW CREATE TABLE INFORMATION_SCHEMA.ROUTINES; SHOW CREATE TABLE INFORMATION_SCHEMA.ROUTINES;
Table Create Table Table Create Table
ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '', `SPECIFIC_NAME` varchar(64) NOT NULL,
`ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '', `ROUTINE_CATALOG` varchar(512) NOT NULL,
`ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `ROUTINE_SCHEMA` varchar(64) NOT NULL,
`ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '', `ROUTINE_NAME` varchar(64) NOT NULL,
`ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '', `ROUTINE_TYPE` varchar(13) NOT NULL,
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `DATA_TYPE` varchar(64) NOT NULL,
`CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL, `CHARACTER_MAXIMUM_LENGTH` int(21),
`CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL, `CHARACTER_OCTET_LENGTH` int(21),
`NUMERIC_PRECISION` int(21) DEFAULT NULL, `NUMERIC_PRECISION` int(21),
`NUMERIC_SCALE` int(21) DEFAULT NULL, `NUMERIC_SCALE` int(21),
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL, `DATETIME_PRECISION` bigint(21) unsigned,
`CHARACTER_SET_NAME` varchar(64) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(64),
`COLLATION_NAME` varchar(64) DEFAULT NULL, `COLLATION_NAME` varchar(64),
`DTD_IDENTIFIER` longtext DEFAULT NULL, `DTD_IDENTIFIER` longtext,
`ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '', `ROUTINE_BODY` varchar(8) NOT NULL,
`ROUTINE_DEFINITION` longtext DEFAULT NULL, `ROUTINE_DEFINITION` longtext,
`EXTERNAL_NAME` varchar(64) DEFAULT NULL, `EXTERNAL_NAME` varchar(64),
`EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL, `EXTERNAL_LANGUAGE` varchar(64),
`PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '', `PARAMETER_STYLE` varchar(8) NOT NULL,
`IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '', `IS_DETERMINISTIC` varchar(3) NOT NULL,
`SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '', `SQL_DATA_ACCESS` varchar(64) NOT NULL,
`SQL_PATH` varchar(64) DEFAULT NULL, `SQL_PATH` varchar(64),
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL,
`CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `CREATED` datetime NOT NULL,
`LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `LAST_ALTERED` datetime NOT NULL,
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`ROUTINE_COMMENT` longtext NOT NULL DEFAULT '', `ROUTINE_COMMENT` longtext NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema' WHERE table_schema = 'information_schema'
...@@ -46,7 +46,7 @@ TABLE_SCHEMA information_schema ...@@ -46,7 +46,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME SPECIFIC_NAME COLUMN_NAME SPECIFIC_NAME
ORDINAL_POSITION 1 ORDINAL_POSITION 1
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -68,7 +68,7 @@ TABLE_SCHEMA information_schema ...@@ -68,7 +68,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_CATALOG COLUMN_NAME ROUTINE_CATALOG
ORDINAL_POSITION 2 ORDINAL_POSITION 2
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 512 CHARACTER_MAXIMUM_LENGTH 512
...@@ -90,7 +90,7 @@ TABLE_SCHEMA information_schema ...@@ -90,7 +90,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_SCHEMA COLUMN_NAME ROUTINE_SCHEMA
ORDINAL_POSITION 3 ORDINAL_POSITION 3
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -112,7 +112,7 @@ TABLE_SCHEMA information_schema ...@@ -112,7 +112,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_NAME COLUMN_NAME ROUTINE_NAME
ORDINAL_POSITION 4 ORDINAL_POSITION 4
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -134,7 +134,7 @@ TABLE_SCHEMA information_schema ...@@ -134,7 +134,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_TYPE COLUMN_NAME ROUTINE_TYPE
ORDINAL_POSITION 5 ORDINAL_POSITION 5
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 13 CHARACTER_MAXIMUM_LENGTH 13
...@@ -156,7 +156,7 @@ TABLE_SCHEMA information_schema ...@@ -156,7 +156,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME DATA_TYPE COLUMN_NAME DATA_TYPE
ORDINAL_POSITION 6 ORDINAL_POSITION 6
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -354,7 +354,7 @@ TABLE_SCHEMA information_schema ...@@ -354,7 +354,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_BODY COLUMN_NAME ROUTINE_BODY
ORDINAL_POSITION 15 ORDINAL_POSITION 15
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 8 CHARACTER_MAXIMUM_LENGTH 8
...@@ -442,7 +442,7 @@ TABLE_SCHEMA information_schema ...@@ -442,7 +442,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME PARAMETER_STYLE COLUMN_NAME PARAMETER_STYLE
ORDINAL_POSITION 19 ORDINAL_POSITION 19
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 8 CHARACTER_MAXIMUM_LENGTH 8
...@@ -464,7 +464,7 @@ TABLE_SCHEMA information_schema ...@@ -464,7 +464,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME IS_DETERMINISTIC COLUMN_NAME IS_DETERMINISTIC
ORDINAL_POSITION 20 ORDINAL_POSITION 20
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 3 CHARACTER_MAXIMUM_LENGTH 3
...@@ -486,7 +486,7 @@ TABLE_SCHEMA information_schema ...@@ -486,7 +486,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME SQL_DATA_ACCESS COLUMN_NAME SQL_DATA_ACCESS
ORDINAL_POSITION 21 ORDINAL_POSITION 21
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 64 CHARACTER_MAXIMUM_LENGTH 64
...@@ -530,7 +530,7 @@ TABLE_SCHEMA information_schema ...@@ -530,7 +530,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME SECURITY_TYPE COLUMN_NAME SECURITY_TYPE
ORDINAL_POSITION 23 ORDINAL_POSITION 23
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 7 CHARACTER_MAXIMUM_LENGTH 7
...@@ -552,7 +552,7 @@ TABLE_SCHEMA information_schema ...@@ -552,7 +552,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME CREATED COLUMN_NAME CREATED
ORDINAL_POSITION 24 ORDINAL_POSITION 24
COLUMN_DEFAULT '0000-00-00 00:00:00' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE datetime DATA_TYPE datetime
CHARACTER_MAXIMUM_LENGTH NULL CHARACTER_MAXIMUM_LENGTH NULL
...@@ -574,7 +574,7 @@ TABLE_SCHEMA information_schema ...@@ -574,7 +574,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME LAST_ALTERED COLUMN_NAME LAST_ALTERED
ORDINAL_POSITION 25 ORDINAL_POSITION 25
COLUMN_DEFAULT '0000-00-00 00:00:00' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE datetime DATA_TYPE datetime
CHARACTER_MAXIMUM_LENGTH NULL CHARACTER_MAXIMUM_LENGTH NULL
...@@ -596,7 +596,7 @@ TABLE_SCHEMA information_schema ...@@ -596,7 +596,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME SQL_MODE COLUMN_NAME SQL_MODE
ORDINAL_POSITION 26 ORDINAL_POSITION 26
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 8192 CHARACTER_MAXIMUM_LENGTH 8192
...@@ -618,7 +618,7 @@ TABLE_SCHEMA information_schema ...@@ -618,7 +618,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME ROUTINE_COMMENT COLUMN_NAME ROUTINE_COMMENT
ORDINAL_POSITION 27 ORDINAL_POSITION 27
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE longtext DATA_TYPE longtext
CHARACTER_MAXIMUM_LENGTH 4294967295 CHARACTER_MAXIMUM_LENGTH 4294967295
...@@ -640,7 +640,7 @@ TABLE_SCHEMA information_schema ...@@ -640,7 +640,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME DEFINER COLUMN_NAME DEFINER
ORDINAL_POSITION 28 ORDINAL_POSITION 28
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 189 CHARACTER_MAXIMUM_LENGTH 189
...@@ -662,7 +662,7 @@ TABLE_SCHEMA information_schema ...@@ -662,7 +662,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME CHARACTER_SET_CLIENT COLUMN_NAME CHARACTER_SET_CLIENT
ORDINAL_POSITION 29 ORDINAL_POSITION 29
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 32 CHARACTER_MAXIMUM_LENGTH 32
...@@ -684,7 +684,7 @@ TABLE_SCHEMA information_schema ...@@ -684,7 +684,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME COLLATION_CONNECTION COLUMN_NAME COLLATION_CONNECTION
ORDINAL_POSITION 30 ORDINAL_POSITION 30
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 32 CHARACTER_MAXIMUM_LENGTH 32
...@@ -706,7 +706,7 @@ TABLE_SCHEMA information_schema ...@@ -706,7 +706,7 @@ TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
COLUMN_NAME DATABASE_COLLATION COLUMN_NAME DATABASE_COLLATION
ORDINAL_POSITION 31 ORDINAL_POSITION 31
COLUMN_DEFAULT '' COLUMN_DEFAULT NULL
IS_NULLABLE NO IS_NULLABLE NO
DATA_TYPE varchar DATA_TYPE varchar
CHARACTER_MAXIMUM_LENGTH 32 CHARACTER_MAXIMUM_LENGTH 32
...@@ -725,12 +725,12 @@ IS_GENERATED NEVER ...@@ -725,12 +725,12 @@ IS_GENERATED NEVER
GENERATION_EXPRESSION NULL GENERATION_EXPRESSION NULL
DESCRIBE INFORMATION_SCHEMA.ROUTINES; DESCRIBE INFORMATION_SCHEMA.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ROUTINE_CATALOG varchar(512) NO ROUTINE_CATALOG varchar(512) NO NULL
ROUTINE_SCHEMA varchar(64) NO ROUTINE_SCHEMA varchar(64) NO NULL
ROUTINE_NAME varchar(64) NO ROUTINE_NAME varchar(64) NO NULL
ROUTINE_TYPE varchar(13) NO ROUTINE_TYPE varchar(13) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -739,23 +739,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL ...@@ -739,23 +739,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext YES NULL DTD_IDENTIFIER longtext YES NULL
ROUTINE_BODY varchar(8) NO ROUTINE_BODY varchar(8) NO NULL
ROUTINE_DEFINITION longtext YES NULL ROUTINE_DEFINITION longtext YES NULL
EXTERNAL_NAME varchar(64) YES NULL EXTERNAL_NAME varchar(64) YES NULL
EXTERNAL_LANGUAGE varchar(64) YES NULL EXTERNAL_LANGUAGE varchar(64) YES NULL
PARAMETER_STYLE varchar(8) NO PARAMETER_STYLE varchar(8) NO NULL
IS_DETERMINISTIC varchar(3) NO IS_DETERMINISTIC varchar(3) NO NULL
SQL_DATA_ACCESS varchar(64) NO SQL_DATA_ACCESS varchar(64) NO NULL
SQL_PATH varchar(64) YES NULL SQL_PATH varchar(64) YES NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
ROUTINE_COMMENT longtext NO ROUTINE_COMMENT longtext NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
# ========== routines.2 ========== # ========== routines.2 ==========
DROP DATABASE IF EXISTS i_s_routines_test; DROP DATABASE IF EXISTS i_s_routines_test;
CREATE DATABASE i_s_routines_test; CREATE DATABASE i_s_routines_test;
......
mysql-test/main/mysqldump.result
View file @ da37bfd8
...@@ -3702,29 +3702,29 @@ DROP TABLE IF EXISTS `TABLES`; ...@@ -3702,29 +3702,29 @@ DROP TABLE IF EXISTS `TABLES`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TEMPORARY TABLE `TABLES` ( CREATE TEMPORARY TABLE `TABLES` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`TABLE_TYPE` varchar(64) NOT NULL DEFAULT '', `TABLE_TYPE` varchar(64) NOT NULL,
`ENGINE` varchar(64) DEFAULT NULL, `ENGINE` varchar(64),
`VERSION` bigint(21) unsigned DEFAULT NULL, `VERSION` bigint(21) unsigned,
`ROW_FORMAT` varchar(10) DEFAULT NULL, `ROW_FORMAT` varchar(10),
`TABLE_ROWS` bigint(21) unsigned DEFAULT NULL, `TABLE_ROWS` bigint(21) unsigned,
`AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL, `AVG_ROW_LENGTH` bigint(21) unsigned,
`DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `DATA_LENGTH` bigint(21) unsigned,
`MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_DATA_LENGTH` bigint(21) unsigned,
`INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `INDEX_LENGTH` bigint(21) unsigned,
`DATA_FREE` bigint(21) unsigned DEFAULT NULL, `DATA_FREE` bigint(21) unsigned,
`AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL, `AUTO_INCREMENT` bigint(21) unsigned,
`CREATE_TIME` datetime DEFAULT NULL, `CREATE_TIME` datetime,
`UPDATE_TIME` datetime DEFAULT NULL, `UPDATE_TIME` datetime,
`CHECK_TIME` datetime DEFAULT NULL, `CHECK_TIME` datetime,
`TABLE_COLLATION` varchar(32) DEFAULT NULL, `TABLE_COLLATION` varchar(32),
`CHECKSUM` bigint(21) unsigned DEFAULT NULL, `CHECKSUM` bigint(21) unsigned,
`CREATE_OPTIONS` varchar(2048) DEFAULT NULL, `CREATE_OPTIONS` varchar(2048),
`TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '', `TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1) DEFAULT NULL `TEMPORARY` varchar(1)
) ENGINE=MEMORY DEFAULT CHARSET=utf8; ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
# #
......
mysql-test/main/show_check.result
View file @ da37bfd8
This diff is collapsed.
mysql-test/main/userstat.result
View file @ da37bfd8
select variable_value from information_schema.global_status where variable_name="handler_read_key" into @global_read_key; select variable_value from information_schema.global_status where variable_name="handler_read_key" into @global_read_key;
show columns from information_schema.client_statistics; show columns from information_schema.client_statistics;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CLIENT varchar(64) NO CLIENT varchar(64) NO NULL
TOTAL_CONNECTIONS bigint(21) NO 0 TOTAL_CONNECTIONS bigint(21) NO NULL
CONCURRENT_CONNECTIONS bigint(21) NO 0 CONCURRENT_CONNECTIONS bigint(21) NO NULL
CONNECTED_TIME bigint(21) NO 0 CONNECTED_TIME bigint(21) NO NULL
BUSY_TIME double NO 0 BUSY_TIME double NO NULL
CPU_TIME double NO 0 CPU_TIME double NO NULL
BYTES_RECEIVED bigint(21) NO 0 BYTES_RECEIVED bigint(21) NO NULL
BYTES_SENT bigint(21) NO 0 BYTES_SENT bigint(21) NO NULL
BINLOG_BYTES_WRITTEN bigint(21) NO 0 BINLOG_BYTES_WRITTEN bigint(21) NO NULL
ROWS_READ bigint(21) NO 0 ROWS_READ bigint(21) NO NULL
ROWS_SENT bigint(21) NO 0 ROWS_SENT bigint(21) NO NULL
ROWS_DELETED bigint(21) NO 0 ROWS_DELETED bigint(21) NO NULL
ROWS_INSERTED bigint(21) NO 0 ROWS_INSERTED bigint(21) NO NULL
ROWS_UPDATED bigint(21) NO 0 ROWS_UPDATED bigint(21) NO NULL
SELECT_COMMANDS bigint(21) NO 0 SELECT_COMMANDS bigint(21) NO NULL
UPDATE_COMMANDS bigint(21) NO 0 UPDATE_COMMANDS bigint(21) NO NULL
OTHER_COMMANDS bigint(21) NO 0 OTHER_COMMANDS bigint(21) NO NULL
COMMIT_TRANSACTIONS bigint(21) NO 0 COMMIT_TRANSACTIONS bigint(21) NO NULL
ROLLBACK_TRANSACTIONS bigint(21) NO 0 ROLLBACK_TRANSACTIONS bigint(21) NO NULL
DENIED_CONNECTIONS bigint(21) NO 0 DENIED_CONNECTIONS bigint(21) NO NULL
LOST_CONNECTIONS bigint(21) NO 0 LOST_CONNECTIONS bigint(21) NO NULL
ACCESS_DENIED bigint(21) NO 0 ACCESS_DENIED bigint(21) NO NULL
EMPTY_QUERIES bigint(21) NO 0 EMPTY_QUERIES bigint(21) NO NULL
TOTAL_SSL_CONNECTIONS bigint(21) unsigned NO 0 TOTAL_SSL_CONNECTIONS bigint(21) unsigned NO NULL
MAX_STATEMENT_TIME_EXCEEDED bigint(21) NO 0 MAX_STATEMENT_TIME_EXCEEDED bigint(21) NO NULL
show columns from information_schema.user_statistics; show columns from information_schema.user_statistics;
Field Type Null Key Default Extra Field Type Null Key Default Extra
USER varchar(128) NO USER varchar(128) NO NULL
TOTAL_CONNECTIONS int(11) NO 0 TOTAL_CONNECTIONS int(11) NO NULL
CONCURRENT_CONNECTIONS int(11) NO 0 CONCURRENT_CONNECTIONS int(11) NO NULL
CONNECTED_TIME int(11) NO 0 CONNECTED_TIME int(11) NO NULL
BUSY_TIME double NO 0 BUSY_TIME double NO NULL
CPU_TIME double NO 0 CPU_TIME double NO NULL
BYTES_RECEIVED bigint(21) NO 0 BYTES_RECEIVED bigint(21) NO NULL
BYTES_SENT bigint(21) NO 0 BYTES_SENT bigint(21) NO NULL
BINLOG_BYTES_WRITTEN bigint(21) NO 0 BINLOG_BYTES_WRITTEN bigint(21) NO NULL
ROWS_READ bigint(21) NO 0 ROWS_READ bigint(21) NO NULL
ROWS_SENT bigint(21) NO 0 ROWS_SENT bigint(21) NO NULL
ROWS_DELETED bigint(21) NO 0 ROWS_DELETED bigint(21) NO NULL
ROWS_INSERTED bigint(21) NO 0 ROWS_INSERTED bigint(21) NO NULL
ROWS_UPDATED bigint(21) NO 0 ROWS_UPDATED bigint(21) NO NULL
SELECT_COMMANDS bigint(21) NO 0 SELECT_COMMANDS bigint(21) NO NULL
UPDATE_COMMANDS bigint(21) NO 0 UPDATE_COMMANDS bigint(21) NO NULL
OTHER_COMMANDS bigint(21) NO 0 OTHER_COMMANDS bigint(21) NO NULL
COMMIT_TRANSACTIONS bigint(21) NO 0 COMMIT_TRANSACTIONS bigint(21) NO NULL
ROLLBACK_TRANSACTIONS bigint(21) NO 0 ROLLBACK_TRANSACTIONS bigint(21) NO NULL
DENIED_CONNECTIONS bigint(21) NO 0 DENIED_CONNECTIONS bigint(21) NO NULL
LOST_CONNECTIONS bigint(21) NO 0 LOST_CONNECTIONS bigint(21) NO NULL
ACCESS_DENIED bigint(21) NO 0 ACCESS_DENIED bigint(21) NO NULL
EMPTY_QUERIES bigint(21) NO 0 EMPTY_QUERIES bigint(21) NO NULL
TOTAL_SSL_CONNECTIONS bigint(21) unsigned NO 0 TOTAL_SSL_CONNECTIONS bigint(21) unsigned NO NULL
MAX_STATEMENT_TIME_EXCEEDED bigint(21) NO 0 MAX_STATEMENT_TIME_EXCEEDED bigint(21) NO NULL
show columns from information_schema.index_statistics; show columns from information_schema.index_statistics;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_SCHEMA varchar(192) NO TABLE_SCHEMA varchar(192) NO NULL
TABLE_NAME varchar(192) NO TABLE_NAME varchar(192) NO NULL
INDEX_NAME varchar(192) NO INDEX_NAME varchar(192) NO NULL
ROWS_READ bigint(21) NO 0 ROWS_READ bigint(21) NO NULL
show columns from information_schema.table_statistics; show columns from information_schema.table_statistics;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_SCHEMA varchar(192) NO TABLE_SCHEMA varchar(192) NO NULL
TABLE_NAME varchar(192) NO TABLE_NAME varchar(192) NO NULL
ROWS_READ bigint(21) NO 0 ROWS_READ bigint(21) NO NULL
ROWS_CHANGED bigint(21) NO 0 ROWS_CHANGED bigint(21) NO NULL
ROWS_CHANGED_X_INDEXES bigint(21) NO 0 ROWS_CHANGED_X_INDEXES bigint(21) NO NULL
set @save_general_log=@@global.general_log; set @save_general_log=@@global.general_log;
set @@global.general_log=0; set @@global.general_log=0;
set @@global.userstat=1; set @@global.userstat=1;
......
mysql-test/suite/funcs_1/r/is_character_sets.result
View file @ da37bfd8
...@@ -28,24 +28,24 @@ DROP FUNCTION test.f1; ...@@ -28,24 +28,24 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.CHARACTER_SETS; DESCRIBE information_schema.CHARACTER_SETS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATE_NAME varchar(32) NO DEFAULT_COLLATE_NAME varchar(32) NO NULL
DESCRIPTION varchar(60) NO DESCRIPTION varchar(60) NO NULL
MAXLEN bigint(3) NO 0 MAXLEN bigint(3) NO NULL
SHOW CREATE TABLE information_schema.CHARACTER_SETS; SHOW CREATE TABLE information_schema.CHARACTER_SETS;
Table Create Table Table Create Table
CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` ( CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '', `DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL DEFAULT 0 `MAXLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.CHARACTER_SETS; SHOW COLUMNS FROM information_schema.CHARACTER_SETS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATE_NAME varchar(32) NO DEFAULT_COLLATE_NAME varchar(32) NO NULL
DESCRIPTION varchar(60) NO DESCRIPTION varchar(60) NO NULL
MAXLEN bigint(3) NO 0 MAXLEN bigint(3) NO NULL
# Testcases 3.2.2.2 and 3.2.2.3 are checked in suite/funcs_1/t/charset_collation*.test # Testcases 3.2.2.2 and 3.2.2.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 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
......
mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
View file @ da37bfd8
...@@ -28,18 +28,18 @@ DROP FUNCTION test.f1; ...@@ -28,18 +28,18 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; DESCRIBE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Field Type Null Key Default Extra Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO COLLATION_NAME varchar(32) NO NULL
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Table Create Table Table Create Table
COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` ( COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
`COLLATION_NAME` varchar(32) NOT NULL DEFAULT '', `COLLATION_NAME` varchar(32) NOT NULL,
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '' `CHARACTER_SET_NAME` varchar(32) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Field Type Null Key Default Extra Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO COLLATION_NAME varchar(32) NO NULL
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
# Testcases 3.2.4.2 and 3.2.4.3 are checked in suite/funcs_1/t/charset_collation*.test # 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 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
......
mysql-test/suite/funcs_1/r/is_collations.result
View file @ da37bfd8
...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1; ...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.COLLATIONS; DESCRIBE information_schema.COLLATIONS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO COLLATION_NAME varchar(32) NO NULL
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
ID bigint(11) NO 0 ID bigint(11) NO NULL
IS_DEFAULT varchar(3) NO IS_DEFAULT varchar(3) NO NULL
IS_COMPILED varchar(3) NO IS_COMPILED varchar(3) NO NULL
SORTLEN bigint(3) NO 0 SORTLEN bigint(3) NO NULL
SHOW CREATE TABLE information_schema.COLLATIONS; SHOW CREATE TABLE information_schema.COLLATIONS;
Table Create Table Table Create Table
COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` ( COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` (
`COLLATION_NAME` varchar(32) NOT NULL DEFAULT '', `COLLATION_NAME` varchar(32) NOT NULL,
`CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) NOT NULL,
`ID` bigint(11) NOT NULL DEFAULT 0, `ID` bigint(11) NOT NULL,
`IS_DEFAULT` varchar(3) NOT NULL DEFAULT '', `IS_DEFAULT` varchar(3) NOT NULL,
`IS_COMPILED` varchar(3) NOT NULL DEFAULT '', `IS_COMPILED` varchar(3) NOT NULL,
`SORTLEN` bigint(3) NOT NULL DEFAULT 0 `SORTLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLLATIONS; SHOW COLUMNS FROM information_schema.COLLATIONS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO COLLATION_NAME varchar(32) NO NULL
CHARACTER_SET_NAME varchar(32) NO CHARACTER_SET_NAME varchar(32) NO NULL
ID bigint(11) NO 0 ID bigint(11) NO NULL
IS_DEFAULT varchar(3) NO IS_DEFAULT varchar(3) NO NULL
IS_COMPILED varchar(3) NO IS_COMPILED varchar(3) NO NULL
SORTLEN bigint(3) NO 0 SORTLEN bigint(3) NO NULL
# Testcases 3.2.3.2 and 3.2.3.3 are checked in suite/funcs_1/t/charset_collation*.test # Testcases 3.2.3.2 and 3.2.3.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 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
......
mysql-test/suite/funcs_1/r/is_column_privileges.result
View file @ da37bfd8
...@@ -28,33 +28,33 @@ DROP FUNCTION test.f1; ...@@ -28,33 +28,33 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.COLUMN_PRIVILEGES; DESCRIBE information_schema.COLUMN_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SHOW CREATE TABLE information_schema.COLUMN_PRIVILEGES; SHOW CREATE TABLE information_schema.COLUMN_PRIVILEGES;
Table Create Table Table Create Table
COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` ( COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
`GRANTEE` varchar(190) NOT NULL DEFAULT '', `GRANTEE` varchar(190) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`COLUMN_NAME` varchar(64) NOT NULL DEFAULT '', `COLUMN_NAME` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL DEFAULT '' `IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES; SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SELECT table_catalog, table_schema, table_name, column_name, privilege_type SELECT table_catalog, table_schema, table_name, column_name, privilege_type
FROM information_schema.column_privileges WHERE table_catalog IS NOT NULL; FROM information_schema.column_privileges WHERE table_catalog IS NOT NULL;
table_catalog table_schema table_name column_name privilege_type table_catalog table_schema table_name column_name privilege_type
......
mysql-test/suite/funcs_1/r/is_columns.result
View file @ da37bfd8
...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1; ...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.COLUMNS; DESCRIBE information_schema.COLUMNS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(21) unsigned NO 0 ORDINAL_POSITION bigint(21) unsigned NO NULL
COLUMN_DEFAULT longtext YES NULL COLUMN_DEFAULT longtext YES NULL
IS_NULLABLE varchar(3) NO IS_NULLABLE varchar(3) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH bigint(21) unsigned YES NULL CHARACTER_MAXIMUM_LENGTH bigint(21) unsigned YES NULL
CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL
NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_PRECISION bigint(21) unsigned YES NULL
...@@ -43,49 +43,49 @@ NUMERIC_SCALE bigint(21) unsigned YES NULL ...@@ -43,49 +43,49 @@ NUMERIC_SCALE bigint(21) unsigned YES NULL
DATETIME_PRECISION bigint(21) unsigned YES NULL DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(32) YES NULL CHARACTER_SET_NAME varchar(32) YES NULL
COLLATION_NAME varchar(32) YES NULL COLLATION_NAME varchar(32) YES NULL
COLUMN_TYPE longtext NO COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO COLUMN_KEY varchar(3) NO NULL
EXTRA varchar(30) NO EXTRA varchar(30) NO NULL
PRIVILEGES varchar(80) NO PRIVILEGES varchar(80) NO NULL
COLUMN_COMMENT varchar(1024) NO COLUMN_COMMENT varchar(1024) NO NULL
IS_GENERATED varchar(6) NO IS_GENERATED varchar(6) NO NULL
GENERATION_EXPRESSION longtext YES NULL GENERATION_EXPRESSION longtext YES NULL
SHOW CREATE TABLE information_schema.COLUMNS; SHOW CREATE TABLE information_schema.COLUMNS;
Table Create Table Table Create Table
COLUMNS CREATE TEMPORARY TABLE `COLUMNS` ( COLUMNS CREATE TEMPORARY TABLE `COLUMNS` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`COLUMN_NAME` varchar(64) NOT NULL DEFAULT '', `COLUMN_NAME` varchar(64) NOT NULL,
`ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0, `ORDINAL_POSITION` bigint(21) unsigned NOT NULL,
`COLUMN_DEFAULT` longtext DEFAULT NULL, `COLUMN_DEFAULT` longtext,
`IS_NULLABLE` varchar(3) NOT NULL DEFAULT '', `IS_NULLABLE` varchar(3) NOT NULL,
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `DATA_TYPE` varchar(64) NOT NULL,
`CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL, `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned,
`CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL, `CHARACTER_OCTET_LENGTH` bigint(21) unsigned,
`NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL, `NUMERIC_PRECISION` bigint(21) unsigned,
`NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL, `NUMERIC_SCALE` bigint(21) unsigned,
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL, `DATETIME_PRECISION` bigint(21) unsigned,
`CHARACTER_SET_NAME` varchar(32) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(32),
`COLLATION_NAME` varchar(32) DEFAULT NULL, `COLLATION_NAME` varchar(32),
`COLUMN_TYPE` longtext NOT NULL DEFAULT '', `COLUMN_TYPE` longtext NOT NULL,
`COLUMN_KEY` varchar(3) NOT NULL DEFAULT '', `COLUMN_KEY` varchar(3) NOT NULL,
`EXTRA` varchar(30) NOT NULL DEFAULT '', `EXTRA` varchar(30) NOT NULL,
`PRIVILEGES` varchar(80) NOT NULL DEFAULT '', `PRIVILEGES` varchar(80) NOT NULL,
`COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '', `COLUMN_COMMENT` varchar(1024) NOT NULL,
`IS_GENERATED` varchar(6) NOT NULL DEFAULT '', `IS_GENERATED` varchar(6) NOT NULL,
`GENERATION_EXPRESSION` longtext DEFAULT NULL `GENERATION_EXPRESSION` longtext
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLUMNS; SHOW COLUMNS FROM information_schema.COLUMNS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(21) unsigned NO 0 ORDINAL_POSITION bigint(21) unsigned NO NULL
COLUMN_DEFAULT longtext YES NULL COLUMN_DEFAULT longtext YES NULL
IS_NULLABLE varchar(3) NO IS_NULLABLE varchar(3) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH bigint(21) unsigned YES NULL CHARACTER_MAXIMUM_LENGTH bigint(21) unsigned YES NULL
CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL CHARACTER_OCTET_LENGTH bigint(21) unsigned YES NULL
NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_PRECISION bigint(21) unsigned YES NULL
...@@ -93,12 +93,12 @@ NUMERIC_SCALE bigint(21) unsigned YES NULL ...@@ -93,12 +93,12 @@ NUMERIC_SCALE bigint(21) unsigned YES NULL
DATETIME_PRECISION bigint(21) unsigned YES NULL DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(32) YES NULL CHARACTER_SET_NAME varchar(32) YES NULL
COLLATION_NAME varchar(32) YES NULL COLLATION_NAME varchar(32) YES NULL
COLUMN_TYPE longtext NO COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO COLUMN_KEY varchar(3) NO NULL
EXTRA varchar(30) NO EXTRA varchar(30) NO NULL
PRIVILEGES varchar(80) NO PRIVILEGES varchar(80) NO NULL
COLUMN_COMMENT varchar(1024) NO COLUMN_COMMENT varchar(1024) NO NULL
IS_GENERATED varchar(6) NO IS_GENERATED varchar(6) NO NULL
GENERATION_EXPRESSION longtext YES NULL GENERATION_EXPRESSION longtext YES NULL
SELECT table_catalog, table_schema, table_name, column_name SELECT table_catalog, table_schema, table_name, column_name
FROM information_schema.columns WHERE table_catalog IS NULL OR table_catalog <> 'def'; FROM information_schema.columns WHERE table_catalog IS NULL OR table_catalog <> 'def';
......
mysql-test/suite/funcs_1/r/is_columns_is.result
View file @ da37bfd8
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
View file @ da37bfd8
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/is_engines.result
View file @ da37bfd8
...@@ -28,27 +28,27 @@ DROP FUNCTION test.f1; ...@@ -28,27 +28,27 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.ENGINES; DESCRIBE information_schema.ENGINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
ENGINE varchar(64) NO ENGINE varchar(64) NO NULL
SUPPORT varchar(8) NO SUPPORT varchar(8) NO NULL
COMMENT varchar(160) NO COMMENT varchar(160) NO NULL
TRANSACTIONS varchar(3) YES NULL TRANSACTIONS varchar(3) YES NULL
XA varchar(3) YES NULL XA varchar(3) YES NULL
SAVEPOINTS varchar(3) YES NULL SAVEPOINTS varchar(3) YES NULL
SHOW CREATE TABLE information_schema.ENGINES; SHOW CREATE TABLE information_schema.ENGINES;
Table Create Table Table Create Table
ENGINES CREATE TEMPORARY TABLE `ENGINES` ( ENGINES CREATE TEMPORARY TABLE `ENGINES` (
`ENGINE` varchar(64) NOT NULL DEFAULT '', `ENGINE` varchar(64) NOT NULL,
`SUPPORT` varchar(8) NOT NULL DEFAULT '', `SUPPORT` varchar(8) NOT NULL,
`COMMENT` varchar(160) NOT NULL DEFAULT '', `COMMENT` varchar(160) NOT NULL,
`TRANSACTIONS` varchar(3) DEFAULT NULL, `TRANSACTIONS` varchar(3),
`XA` varchar(3) DEFAULT NULL, `XA` varchar(3),
`SAVEPOINTS` varchar(3) DEFAULT NULL `SAVEPOINTS` varchar(3)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.ENGINES; SHOW COLUMNS FROM information_schema.ENGINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
ENGINE varchar(64) NO ENGINE varchar(64) NO NULL
SUPPORT varchar(8) NO SUPPORT varchar(8) NO NULL
COMMENT varchar(160) NO COMMENT varchar(160) NO NULL
TRANSACTIONS varchar(3) YES NULL TRANSACTIONS varchar(3) YES NULL
XA varchar(3) YES NULL XA varchar(3) YES NULL
SAVEPOINTS varchar(3) YES NULL SAVEPOINTS varchar(3) YES NULL
......
mysql-test/suite/funcs_1/r/is_events.result
View file @ da37bfd8
...@@ -28,84 +28,84 @@ DROP FUNCTION test.f1; ...@@ -28,84 +28,84 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.EVENTS; DESCRIBE information_schema.EVENTS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
EVENT_CATALOG varchar(64) NO EVENT_CATALOG varchar(64) NO NULL
EVENT_SCHEMA varchar(64) NO EVENT_SCHEMA varchar(64) NO NULL
EVENT_NAME varchar(64) NO EVENT_NAME varchar(64) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
TIME_ZONE varchar(64) NO TIME_ZONE varchar(64) NO NULL
EVENT_BODY varchar(8) NO EVENT_BODY varchar(8) NO NULL
EVENT_DEFINITION longtext NO EVENT_DEFINITION longtext NO NULL
EVENT_TYPE varchar(9) NO EVENT_TYPE varchar(9) NO NULL
EXECUTE_AT datetime YES NULL EXECUTE_AT datetime YES NULL
INTERVAL_VALUE varchar(256) YES NULL INTERVAL_VALUE varchar(256) YES NULL
INTERVAL_FIELD varchar(18) YES NULL INTERVAL_FIELD varchar(18) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
STARTS datetime YES NULL STARTS datetime YES NULL
ENDS datetime YES NULL ENDS datetime YES NULL
STATUS varchar(18) NO STATUS varchar(18) NO NULL
ON_COMPLETION varchar(12) NO ON_COMPLETION varchar(12) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
LAST_EXECUTED datetime YES NULL LAST_EXECUTED datetime YES NULL
EVENT_COMMENT varchar(64) NO EVENT_COMMENT varchar(64) NO NULL
ORIGINATOR bigint(10) NO 0 ORIGINATOR bigint(10) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SHOW CREATE TABLE information_schema.EVENTS; SHOW CREATE TABLE information_schema.EVENTS;
Table Create Table Table Create Table
EVENTS CREATE TEMPORARY TABLE `EVENTS` ( EVENTS CREATE TEMPORARY TABLE `EVENTS` (
`EVENT_CATALOG` varchar(64) NOT NULL DEFAULT '', `EVENT_CATALOG` varchar(64) NOT NULL,
`EVENT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `EVENT_SCHEMA` varchar(64) NOT NULL,
`EVENT_NAME` varchar(64) NOT NULL DEFAULT '', `EVENT_NAME` varchar(64) NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`TIME_ZONE` varchar(64) NOT NULL DEFAULT '', `TIME_ZONE` varchar(64) NOT NULL,
`EVENT_BODY` varchar(8) NOT NULL DEFAULT '', `EVENT_BODY` varchar(8) NOT NULL,
`EVENT_DEFINITION` longtext NOT NULL DEFAULT '', `EVENT_DEFINITION` longtext NOT NULL,
`EVENT_TYPE` varchar(9) NOT NULL DEFAULT '', `EVENT_TYPE` varchar(9) NOT NULL,
`EXECUTE_AT` datetime DEFAULT NULL, `EXECUTE_AT` datetime,
`INTERVAL_VALUE` varchar(256) DEFAULT NULL, `INTERVAL_VALUE` varchar(256),
`INTERVAL_FIELD` varchar(18) DEFAULT NULL, `INTERVAL_FIELD` varchar(18),
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`STARTS` datetime DEFAULT NULL, `STARTS` datetime,
`ENDS` datetime DEFAULT NULL, `ENDS` datetime,
`STATUS` varchar(18) NOT NULL DEFAULT '', `STATUS` varchar(18) NOT NULL,
`ON_COMPLETION` varchar(12) NOT NULL DEFAULT '', `ON_COMPLETION` varchar(12) NOT NULL,
`CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `CREATED` datetime NOT NULL,
`LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `LAST_ALTERED` datetime NOT NULL,
`LAST_EXECUTED` datetime DEFAULT NULL, `LAST_EXECUTED` datetime,
`EVENT_COMMENT` varchar(64) NOT NULL DEFAULT '', `EVENT_COMMENT` varchar(64) NOT NULL,
`ORIGINATOR` bigint(10) NOT NULL DEFAULT 0, `ORIGINATOR` bigint(10) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.EVENTS; SHOW COLUMNS FROM information_schema.EVENTS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
EVENT_CATALOG varchar(64) NO EVENT_CATALOG varchar(64) NO NULL
EVENT_SCHEMA varchar(64) NO EVENT_SCHEMA varchar(64) NO NULL
EVENT_NAME varchar(64) NO EVENT_NAME varchar(64) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
TIME_ZONE varchar(64) NO TIME_ZONE varchar(64) NO NULL
EVENT_BODY varchar(8) NO EVENT_BODY varchar(8) NO NULL
EVENT_DEFINITION longtext NO EVENT_DEFINITION longtext NO NULL
EVENT_TYPE varchar(9) NO EVENT_TYPE varchar(9) NO NULL
EXECUTE_AT datetime YES NULL EXECUTE_AT datetime YES NULL
INTERVAL_VALUE varchar(256) YES NULL INTERVAL_VALUE varchar(256) YES NULL
INTERVAL_FIELD varchar(18) YES NULL INTERVAL_FIELD varchar(18) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
STARTS datetime YES NULL STARTS datetime YES NULL
ENDS datetime YES NULL ENDS datetime YES NULL
STATUS varchar(18) NO STATUS varchar(18) NO NULL
ON_COMPLETION varchar(12) NO ON_COMPLETION varchar(12) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
LAST_EXECUTED datetime YES NULL LAST_EXECUTED datetime YES NULL
EVENT_COMMENT varchar(64) NO EVENT_COMMENT varchar(64) NO NULL
ORIGINATOR bigint(10) NO 0 ORIGINATOR bigint(10) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SELECT event_catalog, event_name, event_body, event_type, event_type, SELECT event_catalog, event_name, event_body, event_type, event_type,
status, on_completion status, on_completion
FROM information_schema.events FROM information_schema.events
......
mysql-test/suite/funcs_1/r/is_key_column_usage.result
View file @ da37bfd8
...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1; ...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.KEY_COLUMN_USAGE; DESCRIBE information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(10) NO 0 ORDINAL_POSITION bigint(10) NO NULL
POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL
REFERENCED_TABLE_SCHEMA varchar(64) YES NULL REFERENCED_TABLE_SCHEMA varchar(64) YES NULL
REFERENCED_TABLE_NAME varchar(64) YES NULL REFERENCED_TABLE_NAME varchar(64) YES NULL
...@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL ...@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL
SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE; SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE;
Table Create Table Table Create Table
KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` ( KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
`CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '', `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
`CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
`CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_NAME` varchar(64) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`COLUMN_NAME` varchar(64) NOT NULL DEFAULT '', `COLUMN_NAME` varchar(64) NOT NULL,
`ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT 0, `ORDINAL_POSITION` bigint(10) NOT NULL,
`POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL, `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10),
`REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL, `REFERENCED_TABLE_SCHEMA` varchar(64),
`REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL, `REFERENCED_TABLE_NAME` varchar(64),
`REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL `REFERENCED_COLUMN_NAME` varchar(64)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE; SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(10) NO 0 ORDINAL_POSITION bigint(10) NO NULL
POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL
REFERENCED_TABLE_SCHEMA varchar(64) YES NULL REFERENCED_TABLE_SCHEMA varchar(64) YES NULL
REFERENCED_TABLE_NAME varchar(64) YES NULL REFERENCED_TABLE_NAME varchar(64) YES NULL
......
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
View file @ da37bfd8
...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1; ...@@ -28,14 +28,14 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.KEY_COLUMN_USAGE; DESCRIBE information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(10) NO 0 ORDINAL_POSITION bigint(10) NO NULL
POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL
REFERENCED_TABLE_SCHEMA varchar(64) YES NULL REFERENCED_TABLE_SCHEMA varchar(64) YES NULL
REFERENCED_TABLE_NAME varchar(64) YES NULL REFERENCED_TABLE_NAME varchar(64) YES NULL
...@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL ...@@ -43,29 +43,29 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL
SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE; SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE;
Table Create Table Table Create Table
KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` ( KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
`CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '', `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
`CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
`CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_NAME` varchar(64) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`COLUMN_NAME` varchar(64) NOT NULL DEFAULT '', `COLUMN_NAME` varchar(64) NOT NULL,
`ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT 0, `ORDINAL_POSITION` bigint(10) NOT NULL,
`POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL, `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10),
`REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL, `REFERENCED_TABLE_SCHEMA` varchar(64),
`REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL, `REFERENCED_TABLE_NAME` varchar(64),
`REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL `REFERENCED_COLUMN_NAME` varchar(64)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE; SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
ORDINAL_POSITION bigint(10) NO 0 ORDINAL_POSITION bigint(10) NO NULL
POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL POSITION_IN_UNIQUE_CONSTRAINT bigint(10) YES NULL
REFERENCED_TABLE_SCHEMA varchar(64) YES NULL REFERENCED_TABLE_SCHEMA varchar(64) YES NULL
REFERENCED_TABLE_NAME varchar(64) YES NULL REFERENCED_TABLE_NAME varchar(64) YES NULL
......
mysql-test/suite/funcs_1/r/is_routines.result
View file @ da37bfd8
...@@ -29,12 +29,12 @@ DROP FUNCTION test.f1; ...@@ -29,12 +29,12 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.ROUTINES; DESCRIBE information_schema.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ROUTINE_CATALOG varchar(512) NO ROUTINE_CATALOG varchar(512) NO NULL
ROUTINE_SCHEMA varchar(64) NO ROUTINE_SCHEMA varchar(64) NO NULL
ROUTINE_NAME varchar(64) NO ROUTINE_NAME varchar(64) NO NULL
ROUTINE_TYPE varchar(13) NO ROUTINE_TYPE varchar(13) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -43,66 +43,66 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL ...@@ -43,66 +43,66 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext YES NULL DTD_IDENTIFIER longtext YES NULL
ROUTINE_BODY varchar(8) NO ROUTINE_BODY varchar(8) NO NULL
ROUTINE_DEFINITION longtext YES NULL ROUTINE_DEFINITION longtext YES NULL
EXTERNAL_NAME varchar(64) YES NULL EXTERNAL_NAME varchar(64) YES NULL
EXTERNAL_LANGUAGE varchar(64) YES NULL EXTERNAL_LANGUAGE varchar(64) YES NULL
PARAMETER_STYLE varchar(8) NO PARAMETER_STYLE varchar(8) NO NULL
IS_DETERMINISTIC varchar(3) NO IS_DETERMINISTIC varchar(3) NO NULL
SQL_DATA_ACCESS varchar(64) NO SQL_DATA_ACCESS varchar(64) NO NULL
SQL_PATH varchar(64) YES NULL SQL_PATH varchar(64) YES NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
ROUTINE_COMMENT longtext NO ROUTINE_COMMENT longtext NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SHOW CREATE TABLE information_schema.ROUTINES; SHOW CREATE TABLE information_schema.ROUTINES;
Table Create Table Table Create Table
ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '', `SPECIFIC_NAME` varchar(64) NOT NULL,
`ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '', `ROUTINE_CATALOG` varchar(512) NOT NULL,
`ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `ROUTINE_SCHEMA` varchar(64) NOT NULL,
`ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '', `ROUTINE_NAME` varchar(64) NOT NULL,
`ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '', `ROUTINE_TYPE` varchar(13) NOT NULL,
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `DATA_TYPE` varchar(64) NOT NULL,
`CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL, `CHARACTER_MAXIMUM_LENGTH` int(21),
`CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL, `CHARACTER_OCTET_LENGTH` int(21),
`NUMERIC_PRECISION` int(21) DEFAULT NULL, `NUMERIC_PRECISION` int(21),
`NUMERIC_SCALE` int(21) DEFAULT NULL, `NUMERIC_SCALE` int(21),
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL, `DATETIME_PRECISION` bigint(21) unsigned,
`CHARACTER_SET_NAME` varchar(64) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(64),
`COLLATION_NAME` varchar(64) DEFAULT NULL, `COLLATION_NAME` varchar(64),
`DTD_IDENTIFIER` longtext DEFAULT NULL, `DTD_IDENTIFIER` longtext,
`ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '', `ROUTINE_BODY` varchar(8) NOT NULL,
`ROUTINE_DEFINITION` longtext DEFAULT NULL, `ROUTINE_DEFINITION` longtext,
`EXTERNAL_NAME` varchar(64) DEFAULT NULL, `EXTERNAL_NAME` varchar(64),
`EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL, `EXTERNAL_LANGUAGE` varchar(64),
`PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '', `PARAMETER_STYLE` varchar(8) NOT NULL,
`IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '', `IS_DETERMINISTIC` varchar(3) NOT NULL,
`SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '', `SQL_DATA_ACCESS` varchar(64) NOT NULL,
`SQL_PATH` varchar(64) DEFAULT NULL, `SQL_PATH` varchar(64),
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL,
`CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `CREATED` datetime NOT NULL,
`LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `LAST_ALTERED` datetime NOT NULL,
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`ROUTINE_COMMENT` longtext NOT NULL DEFAULT '', `ROUTINE_COMMENT` longtext NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.ROUTINES; SHOW COLUMNS FROM information_schema.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ROUTINE_CATALOG varchar(512) NO ROUTINE_CATALOG varchar(512) NO NULL
ROUTINE_SCHEMA varchar(64) NO ROUTINE_SCHEMA varchar(64) NO NULL
ROUTINE_NAME varchar(64) NO ROUTINE_NAME varchar(64) NO NULL
ROUTINE_TYPE varchar(13) NO ROUTINE_TYPE varchar(13) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -111,23 +111,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL ...@@ -111,23 +111,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext YES NULL DTD_IDENTIFIER longtext YES NULL
ROUTINE_BODY varchar(8) NO ROUTINE_BODY varchar(8) NO NULL
ROUTINE_DEFINITION longtext YES NULL ROUTINE_DEFINITION longtext YES NULL
EXTERNAL_NAME varchar(64) YES NULL EXTERNAL_NAME varchar(64) YES NULL
EXTERNAL_LANGUAGE varchar(64) YES NULL EXTERNAL_LANGUAGE varchar(64) YES NULL
PARAMETER_STYLE varchar(8) NO PARAMETER_STYLE varchar(8) NO NULL
IS_DETERMINISTIC varchar(3) NO IS_DETERMINISTIC varchar(3) NO NULL
SQL_DATA_ACCESS varchar(64) NO SQL_DATA_ACCESS varchar(64) NO NULL
SQL_PATH varchar(64) YES NULL SQL_PATH varchar(64) YES NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
ROUTINE_COMMENT longtext NO ROUTINE_COMMENT longtext NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
USE test; USE test;
DROP PROCEDURE IF EXISTS sp_for_routines; DROP PROCEDURE IF EXISTS sp_for_routines;
DROP FUNCTION IF EXISTS function_for_routines; DROP FUNCTION IF EXISTS function_for_routines;
......
mysql-test/suite/funcs_1/r/is_routines_embedded.result
View file @ da37bfd8
...@@ -29,12 +29,12 @@ DROP FUNCTION test.f1; ...@@ -29,12 +29,12 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.ROUTINES; DESCRIBE information_schema.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ROUTINE_CATALOG varchar(512) NO ROUTINE_CATALOG varchar(512) NO NULL
ROUTINE_SCHEMA varchar(64) NO ROUTINE_SCHEMA varchar(64) NO NULL
ROUTINE_NAME varchar(64) NO ROUTINE_NAME varchar(64) NO NULL
ROUTINE_TYPE varchar(13) NO ROUTINE_TYPE varchar(13) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -43,66 +43,66 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL ...@@ -43,66 +43,66 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext YES NULL DTD_IDENTIFIER longtext YES NULL
ROUTINE_BODY varchar(8) NO ROUTINE_BODY varchar(8) NO NULL
ROUTINE_DEFINITION longtext YES NULL ROUTINE_DEFINITION longtext YES NULL
EXTERNAL_NAME varchar(64) YES NULL EXTERNAL_NAME varchar(64) YES NULL
EXTERNAL_LANGUAGE varchar(64) YES NULL EXTERNAL_LANGUAGE varchar(64) YES NULL
PARAMETER_STYLE varchar(8) NO PARAMETER_STYLE varchar(8) NO NULL
IS_DETERMINISTIC varchar(3) NO IS_DETERMINISTIC varchar(3) NO NULL
SQL_DATA_ACCESS varchar(64) NO SQL_DATA_ACCESS varchar(64) NO NULL
SQL_PATH varchar(64) YES NULL SQL_PATH varchar(64) YES NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
ROUTINE_COMMENT longtext NO ROUTINE_COMMENT longtext NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SHOW CREATE TABLE information_schema.ROUTINES; SHOW CREATE TABLE information_schema.ROUTINES;
Table Create Table Table Create Table
ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '', `SPECIFIC_NAME` varchar(64) NOT NULL,
`ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '', `ROUTINE_CATALOG` varchar(512) NOT NULL,
`ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `ROUTINE_SCHEMA` varchar(64) NOT NULL,
`ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '', `ROUTINE_NAME` varchar(64) NOT NULL,
`ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '', `ROUTINE_TYPE` varchar(13) NOT NULL,
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `DATA_TYPE` varchar(64) NOT NULL,
`CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL, `CHARACTER_MAXIMUM_LENGTH` int(21),
`CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL, `CHARACTER_OCTET_LENGTH` int(21),
`NUMERIC_PRECISION` int(21) DEFAULT NULL, `NUMERIC_PRECISION` int(21),
`NUMERIC_SCALE` int(21) DEFAULT NULL, `NUMERIC_SCALE` int(21),
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL, `DATETIME_PRECISION` bigint(21) unsigned,
`CHARACTER_SET_NAME` varchar(64) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(64),
`COLLATION_NAME` varchar(64) DEFAULT NULL, `COLLATION_NAME` varchar(64),
`DTD_IDENTIFIER` longtext DEFAULT NULL, `DTD_IDENTIFIER` longtext,
`ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '', `ROUTINE_BODY` varchar(8) NOT NULL,
`ROUTINE_DEFINITION` longtext DEFAULT NULL, `ROUTINE_DEFINITION` longtext,
`EXTERNAL_NAME` varchar(64) DEFAULT NULL, `EXTERNAL_NAME` varchar(64),
`EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL, `EXTERNAL_LANGUAGE` varchar(64),
`PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '', `PARAMETER_STYLE` varchar(8) NOT NULL,
`IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '', `IS_DETERMINISTIC` varchar(3) NOT NULL,
`SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '', `SQL_DATA_ACCESS` varchar(64) NOT NULL,
`SQL_PATH` varchar(64) DEFAULT NULL, `SQL_PATH` varchar(64),
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL,
`CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `CREATED` datetime NOT NULL,
`LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `LAST_ALTERED` datetime NOT NULL,
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`ROUTINE_COMMENT` longtext NOT NULL DEFAULT '', `ROUTINE_COMMENT` longtext NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.ROUTINES; SHOW COLUMNS FROM information_schema.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO NULL
ROUTINE_CATALOG varchar(512) NO ROUTINE_CATALOG varchar(512) NO NULL
ROUTINE_SCHEMA varchar(64) NO ROUTINE_SCHEMA varchar(64) NO NULL
ROUTINE_NAME varchar(64) NO ROUTINE_NAME varchar(64) NO NULL
ROUTINE_TYPE varchar(13) NO ROUTINE_TYPE varchar(13) NO NULL
DATA_TYPE varchar(64) NO DATA_TYPE varchar(64) NO NULL
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
CHARACTER_OCTET_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL
NUMERIC_PRECISION int(21) YES NULL NUMERIC_PRECISION int(21) YES NULL
...@@ -111,23 +111,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL ...@@ -111,23 +111,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
CHARACTER_SET_NAME varchar(64) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL
DTD_IDENTIFIER longtext YES NULL DTD_IDENTIFIER longtext YES NULL
ROUTINE_BODY varchar(8) NO ROUTINE_BODY varchar(8) NO NULL
ROUTINE_DEFINITION longtext YES NULL ROUTINE_DEFINITION longtext YES NULL
EXTERNAL_NAME varchar(64) YES NULL EXTERNAL_NAME varchar(64) YES NULL
EXTERNAL_LANGUAGE varchar(64) YES NULL EXTERNAL_LANGUAGE varchar(64) YES NULL
PARAMETER_STYLE varchar(8) NO PARAMETER_STYLE varchar(8) NO NULL
IS_DETERMINISTIC varchar(3) NO IS_DETERMINISTIC varchar(3) NO NULL
SQL_DATA_ACCESS varchar(64) NO SQL_DATA_ACCESS varchar(64) NO NULL
SQL_PATH varchar(64) YES NULL SQL_PATH varchar(64) YES NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CREATED datetime NO 0000-00-00 00:00:00 CREATED datetime NO NULL
LAST_ALTERED datetime NO 0000-00-00 00:00:00 LAST_ALTERED datetime NO NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
ROUTINE_COMMENT longtext NO ROUTINE_COMMENT longtext NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
USE test; USE test;
DROP PROCEDURE IF EXISTS sp_for_routines; DROP PROCEDURE IF EXISTS sp_for_routines;
DROP FUNCTION IF EXISTS function_for_routines; DROP FUNCTION IF EXISTS function_for_routines;
......
mysql-test/suite/funcs_1/r/is_schema_privileges.result
View file @ da37bfd8
...@@ -28,27 +28,27 @@ DROP FUNCTION test.f1; ...@@ -28,27 +28,27 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.SCHEMA_PRIVILEGES; DESCRIBE information_schema.SCHEMA_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SHOW CREATE TABLE information_schema.SCHEMA_PRIVILEGES; SHOW CREATE TABLE information_schema.SCHEMA_PRIVILEGES;
Table Create Table Table Create Table
SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` ( SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
`GRANTEE` varchar(190) NOT NULL DEFAULT '', `GRANTEE` varchar(190) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL DEFAULT '' `IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES; SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SELECT GRANTEE, TABLE_CATALOG, TABLE_SCHEMA, PRIVILEGE_TYPE SELECT GRANTEE, TABLE_CATALOG, TABLE_SCHEMA, PRIVILEGE_TYPE
FROM information_schema.schema_privileges WHERE table_catalog IS NOT NULL; FROM information_schema.schema_privileges WHERE table_catalog IS NOT NULL;
GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE
......
mysql-test/suite/funcs_1/r/is_schemata.result
View file @ da37bfd8
...@@ -28,26 +28,26 @@ DROP FUNCTION test.f1; ...@@ -28,26 +28,26 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.SCHEMATA; DESCRIBE information_schema.SCHEMATA;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO CATALOG_NAME varchar(512) NO NULL
SCHEMA_NAME varchar(64) NO SCHEMA_NAME varchar(64) NO NULL
DEFAULT_CHARACTER_SET_NAME varchar(32) NO DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATION_NAME varchar(32) NO DEFAULT_COLLATION_NAME varchar(32) NO NULL
SQL_PATH varchar(512) YES NULL SQL_PATH varchar(512) YES NULL
SHOW CREATE TABLE information_schema.SCHEMATA; SHOW CREATE TABLE information_schema.SCHEMATA;
Table Create Table Table Create Table
SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`CATALOG_NAME` varchar(512) NOT NULL DEFAULT '', `CATALOG_NAME` varchar(512) NOT NULL,
`SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '', `SCHEMA_NAME` varchar(64) NOT NULL,
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
`SQL_PATH` varchar(512) DEFAULT NULL `SQL_PATH` varchar(512)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMATA; SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO CATALOG_NAME varchar(512) NO NULL
SCHEMA_NAME varchar(64) NO SCHEMA_NAME varchar(64) NO NULL
DEFAULT_CHARACTER_SET_NAME varchar(32) NO DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATION_NAME varchar(32) NO DEFAULT_COLLATION_NAME varchar(32) NO NULL
SQL_PATH varchar(512) YES NULL SQL_PATH varchar(512) YES NULL
SELECT catalog_name, schema_name, sql_path SELECT catalog_name, schema_name, sql_path
FROM information_schema.schemata FROM information_schema.schemata
......
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
View file @ da37bfd8
...@@ -28,26 +28,26 @@ DROP FUNCTION test.f1; ...@@ -28,26 +28,26 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.SCHEMATA; DESCRIBE information_schema.SCHEMATA;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO CATALOG_NAME varchar(512) NO NULL
SCHEMA_NAME varchar(64) NO SCHEMA_NAME varchar(64) NO NULL
DEFAULT_CHARACTER_SET_NAME varchar(32) NO DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATION_NAME varchar(32) NO DEFAULT_COLLATION_NAME varchar(32) NO NULL
SQL_PATH varchar(512) YES NULL SQL_PATH varchar(512) YES NULL
SHOW CREATE TABLE information_schema.SCHEMATA; SHOW CREATE TABLE information_schema.SCHEMATA;
Table Create Table Table Create Table
SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`CATALOG_NAME` varchar(512) NOT NULL DEFAULT '', `CATALOG_NAME` varchar(512) NOT NULL,
`SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '', `SCHEMA_NAME` varchar(64) NOT NULL,
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '', `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
`SQL_PATH` varchar(512) DEFAULT NULL `SQL_PATH` varchar(512)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMATA; SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO CATALOG_NAME varchar(512) NO NULL
SCHEMA_NAME varchar(64) NO SCHEMA_NAME varchar(64) NO NULL
DEFAULT_CHARACTER_SET_NAME varchar(32) NO DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL
DEFAULT_COLLATION_NAME varchar(32) NO DEFAULT_COLLATION_NAME varchar(32) NO NULL
SQL_PATH varchar(512) YES NULL SQL_PATH varchar(512) YES NULL
SELECT catalog_name, schema_name, sql_path SELECT catalog_name, schema_name, sql_path
FROM information_schema.schemata FROM information_schema.schemata
......
mysql-test/suite/funcs_1/r/is_statistics.result
View file @ da37bfd8
...@@ -28,60 +28,60 @@ DROP FUNCTION test.f1; ...@@ -28,60 +28,60 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.STATISTICS; DESCRIBE information_schema.STATISTICS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
NON_UNIQUE bigint(1) NO 0 NON_UNIQUE bigint(1) NO NULL
INDEX_SCHEMA varchar(64) NO INDEX_SCHEMA varchar(64) NO NULL
INDEX_NAME varchar(64) NO INDEX_NAME varchar(64) NO NULL
SEQ_IN_INDEX bigint(2) NO 0 SEQ_IN_INDEX bigint(2) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
COLLATION varchar(1) YES NULL COLLATION varchar(1) YES NULL
CARDINALITY bigint(21) YES NULL CARDINALITY bigint(21) YES NULL
SUB_PART bigint(3) YES NULL SUB_PART bigint(3) YES NULL
PACKED varchar(10) YES NULL PACKED varchar(10) YES NULL
NULLABLE varchar(3) NO NULLABLE varchar(3) NO NULL
INDEX_TYPE varchar(16) NO INDEX_TYPE varchar(16) NO NULL
COMMENT varchar(16) YES NULL COMMENT varchar(16) YES NULL
INDEX_COMMENT varchar(1024) NO INDEX_COMMENT varchar(1024) NO NULL
SHOW CREATE TABLE information_schema.STATISTICS; SHOW CREATE TABLE information_schema.STATISTICS;
Table Create Table Table Create Table
STATISTICS CREATE TEMPORARY TABLE `STATISTICS` ( STATISTICS CREATE TEMPORARY TABLE `STATISTICS` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`NON_UNIQUE` bigint(1) NOT NULL DEFAULT 0, `NON_UNIQUE` bigint(1) NOT NULL,
`INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '', `INDEX_SCHEMA` varchar(64) NOT NULL,
`INDEX_NAME` varchar(64) NOT NULL DEFAULT '', `INDEX_NAME` varchar(64) NOT NULL,
`SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT 0, `SEQ_IN_INDEX` bigint(2) NOT NULL,
`COLUMN_NAME` varchar(64) NOT NULL DEFAULT '', `COLUMN_NAME` varchar(64) NOT NULL,
`COLLATION` varchar(1) DEFAULT NULL, `COLLATION` varchar(1),
`CARDINALITY` bigint(21) DEFAULT NULL, `CARDINALITY` bigint(21),
`SUB_PART` bigint(3) DEFAULT NULL, `SUB_PART` bigint(3),
`PACKED` varchar(10) DEFAULT NULL, `PACKED` varchar(10),
`NULLABLE` varchar(3) NOT NULL DEFAULT '', `NULLABLE` varchar(3) NOT NULL,
`INDEX_TYPE` varchar(16) NOT NULL DEFAULT '', `INDEX_TYPE` varchar(16) NOT NULL,
`COMMENT` varchar(16) DEFAULT NULL, `COMMENT` varchar(16),
`INDEX_COMMENT` varchar(1024) NOT NULL DEFAULT '' `INDEX_COMMENT` varchar(1024) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.STATISTICS; SHOW COLUMNS FROM information_schema.STATISTICS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
NON_UNIQUE bigint(1) NO 0 NON_UNIQUE bigint(1) NO NULL
INDEX_SCHEMA varchar(64) NO INDEX_SCHEMA varchar(64) NO NULL
INDEX_NAME varchar(64) NO INDEX_NAME varchar(64) NO NULL
SEQ_IN_INDEX bigint(2) NO 0 SEQ_IN_INDEX bigint(2) NO NULL
COLUMN_NAME varchar(64) NO COLUMN_NAME varchar(64) NO NULL
COLLATION varchar(1) YES NULL COLLATION varchar(1) YES NULL
CARDINALITY bigint(21) YES NULL CARDINALITY bigint(21) YES NULL
SUB_PART bigint(3) YES NULL SUB_PART bigint(3) YES NULL
PACKED varchar(10) YES NULL PACKED varchar(10) YES NULL
NULLABLE varchar(3) NO NULLABLE varchar(3) NO NULL
INDEX_TYPE varchar(16) NO INDEX_TYPE varchar(16) NO NULL
COMMENT varchar(16) YES NULL COMMENT varchar(16) YES NULL
INDEX_COMMENT varchar(1024) NO INDEX_COMMENT varchar(1024) NO NULL
SELECT table_catalog, table_schema, table_name, index_schema, index_name SELECT table_catalog, table_schema, table_name, index_schema, index_name
FROM information_schema.statistics WHERE table_catalog IS NOT NULL FROM information_schema.statistics WHERE table_catalog IS NOT NULL
ORDER BY table_schema, table_name, index_schema, index_name; ORDER BY table_schema, table_name, index_schema, index_name;
......
mysql-test/suite/funcs_1/r/is_table_constraints.result
View file @ da37bfd8
...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1; ...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TABLE_CONSTRAINTS; DESCRIBE information_schema.TABLE_CONSTRAINTS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
CONSTRAINT_TYPE varchar(64) NO CONSTRAINT_TYPE varchar(64) NO NULL
SHOW CREATE TABLE information_schema.TABLE_CONSTRAINTS; SHOW CREATE TABLE information_schema.TABLE_CONSTRAINTS;
Table Create Table Table Create Table
TABLE_CONSTRAINTS CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` ( TABLE_CONSTRAINTS CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
`CONSTRAINT_CATALOG` varchar(512) NOT NULL DEFAULT '', `CONSTRAINT_CATALOG` varchar(512) NOT NULL,
`CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_SCHEMA` varchar(64) NOT NULL,
`CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '', `CONSTRAINT_NAME` varchar(64) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT '' `CONSTRAINT_TYPE` varchar(64) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS; SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO CONSTRAINT_CATALOG varchar(512) NO NULL
CONSTRAINT_SCHEMA varchar(64) NO CONSTRAINT_SCHEMA varchar(64) NO NULL
CONSTRAINT_NAME varchar(64) NO CONSTRAINT_NAME varchar(64) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
CONSTRAINT_TYPE varchar(64) NO CONSTRAINT_TYPE varchar(64) NO NULL
SELECT constraint_catalog, constraint_schema, constraint_name, SELECT constraint_catalog, constraint_schema, constraint_name,
table_schema, table_name table_schema, table_name
FROM information_schema.table_constraints FROM information_schema.table_constraints
......
mysql-test/suite/funcs_1/r/is_table_privileges.result
View file @ da37bfd8
...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1; ...@@ -28,30 +28,30 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TABLE_PRIVILEGES; DESCRIBE information_schema.TABLE_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SHOW CREATE TABLE information_schema.TABLE_PRIVILEGES; SHOW CREATE TABLE information_schema.TABLE_PRIVILEGES;
Table Create Table Table Create Table
TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` ( TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
`GRANTEE` varchar(190) NOT NULL DEFAULT '', `GRANTEE` varchar(190) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL DEFAULT '' `IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES; SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SELECT table_catalog, table_schema, table_name, privilege_type SELECT table_catalog, table_schema, table_name, privilege_type
FROM information_schema.table_privileges WHERE table_catalog IS NOT NULL; FROM information_schema.table_privileges WHERE table_catalog IS NOT NULL;
table_catalog table_schema table_name privilege_type table_catalog table_schema table_name privilege_type
......
mysql-test/suite/funcs_1/r/is_tables.result
View file @ da37bfd8
...@@ -28,10 +28,10 @@ DROP FUNCTION test.f1; ...@@ -28,10 +28,10 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TABLES; DESCRIBE information_schema.TABLES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
TABLE_TYPE varchar(64) NO TABLE_TYPE varchar(64) NO NULL
ENGINE varchar(64) YES NULL ENGINE varchar(64) YES NULL
VERSION bigint(21) unsigned YES NULL VERSION bigint(21) unsigned YES NULL
ROW_FORMAT varchar(10) YES NULL ROW_FORMAT varchar(10) YES NULL
...@@ -48,42 +48,42 @@ CHECK_TIME datetime YES NULL ...@@ -48,42 +48,42 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(32) YES NULL TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(2048) YES NULL CREATE_OPTIONS varchar(2048) YES NULL
TABLE_COMMENT varchar(2048) NO TABLE_COMMENT varchar(2048) NO NULL
MAX_INDEX_LENGTH bigint(21) unsigned YES NULL MAX_INDEX_LENGTH bigint(21) unsigned YES NULL
TEMPORARY varchar(1) YES NULL TEMPORARY varchar(1) YES NULL
SHOW CREATE TABLE information_schema.TABLES; SHOW CREATE TABLE information_schema.TABLES;
Table Create Table Table Create Table
TABLES CREATE TEMPORARY TABLE `TABLES` ( TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`TABLE_TYPE` varchar(64) NOT NULL DEFAULT '', `TABLE_TYPE` varchar(64) NOT NULL,
`ENGINE` varchar(64) DEFAULT NULL, `ENGINE` varchar(64),
`VERSION` bigint(21) unsigned DEFAULT NULL, `VERSION` bigint(21) unsigned,
`ROW_FORMAT` varchar(10) DEFAULT NULL, `ROW_FORMAT` varchar(10),
`TABLE_ROWS` bigint(21) unsigned DEFAULT NULL, `TABLE_ROWS` bigint(21) unsigned,
`AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL, `AVG_ROW_LENGTH` bigint(21) unsigned,
`DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `DATA_LENGTH` bigint(21) unsigned,
`MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_DATA_LENGTH` bigint(21) unsigned,
`INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `INDEX_LENGTH` bigint(21) unsigned,
`DATA_FREE` bigint(21) unsigned DEFAULT NULL, `DATA_FREE` bigint(21) unsigned,
`AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL, `AUTO_INCREMENT` bigint(21) unsigned,
`CREATE_TIME` datetime DEFAULT NULL, `CREATE_TIME` datetime,
`UPDATE_TIME` datetime DEFAULT NULL, `UPDATE_TIME` datetime,
`CHECK_TIME` datetime DEFAULT NULL, `CHECK_TIME` datetime,
`TABLE_COLLATION` varchar(32) DEFAULT NULL, `TABLE_COLLATION` varchar(32),
`CHECKSUM` bigint(21) unsigned DEFAULT NULL, `CHECKSUM` bigint(21) unsigned,
`CREATE_OPTIONS` varchar(2048) DEFAULT NULL, `CREATE_OPTIONS` varchar(2048),
`TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '', `TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1) DEFAULT NULL `TEMPORARY` varchar(1)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLES; SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
TABLE_TYPE varchar(64) NO TABLE_TYPE varchar(64) NO NULL
ENGINE varchar(64) YES NULL ENGINE varchar(64) YES NULL
VERSION bigint(21) unsigned YES NULL VERSION bigint(21) unsigned YES NULL
ROW_FORMAT varchar(10) YES NULL ROW_FORMAT varchar(10) YES NULL
...@@ -100,7 +100,7 @@ CHECK_TIME datetime YES NULL ...@@ -100,7 +100,7 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(32) YES NULL TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(2048) YES NULL CREATE_OPTIONS varchar(2048) YES NULL
TABLE_COMMENT varchar(2048) NO TABLE_COMMENT varchar(2048) NO NULL
MAX_INDEX_LENGTH bigint(21) unsigned YES NULL MAX_INDEX_LENGTH bigint(21) unsigned YES NULL
TEMPORARY varchar(1) YES NULL TEMPORARY varchar(1) YES NULL
SELECT table_catalog, table_schema, table_name SELECT table_catalog, table_schema, table_name
......
mysql-test/suite/funcs_1/r/is_tables_embedded.result
View file @ da37bfd8
...@@ -28,10 +28,10 @@ DROP FUNCTION test.f1; ...@@ -28,10 +28,10 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TABLES; DESCRIBE information_schema.TABLES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
TABLE_TYPE varchar(64) NO TABLE_TYPE varchar(64) NO NULL
ENGINE varchar(64) YES NULL ENGINE varchar(64) YES NULL
VERSION bigint(21) unsigned YES NULL VERSION bigint(21) unsigned YES NULL
ROW_FORMAT varchar(10) YES NULL ROW_FORMAT varchar(10) YES NULL
...@@ -48,42 +48,42 @@ CHECK_TIME datetime YES NULL ...@@ -48,42 +48,42 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(32) YES NULL TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(2048) YES NULL CREATE_OPTIONS varchar(2048) YES NULL
TABLE_COMMENT varchar(2048) NO TABLE_COMMENT varchar(2048) NO NULL
MAX_INDEX_LENGTH bigint(21) unsigned YES NULL MAX_INDEX_LENGTH bigint(21) unsigned YES NULL
TEMPORARY varchar(1) YES NULL TEMPORARY varchar(1) YES NULL
SHOW CREATE TABLE information_schema.TABLES; SHOW CREATE TABLE information_schema.TABLES;
Table Create Table Table Create Table
TABLES CREATE TEMPORARY TABLE `TABLES` ( TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`TABLE_TYPE` varchar(64) NOT NULL DEFAULT '', `TABLE_TYPE` varchar(64) NOT NULL,
`ENGINE` varchar(64) DEFAULT NULL, `ENGINE` varchar(64),
`VERSION` bigint(21) unsigned DEFAULT NULL, `VERSION` bigint(21) unsigned,
`ROW_FORMAT` varchar(10) DEFAULT NULL, `ROW_FORMAT` varchar(10),
`TABLE_ROWS` bigint(21) unsigned DEFAULT NULL, `TABLE_ROWS` bigint(21) unsigned,
`AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL, `AVG_ROW_LENGTH` bigint(21) unsigned,
`DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `DATA_LENGTH` bigint(21) unsigned,
`MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_DATA_LENGTH` bigint(21) unsigned,
`INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `INDEX_LENGTH` bigint(21) unsigned,
`DATA_FREE` bigint(21) unsigned DEFAULT NULL, `DATA_FREE` bigint(21) unsigned,
`AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL, `AUTO_INCREMENT` bigint(21) unsigned,
`CREATE_TIME` datetime DEFAULT NULL, `CREATE_TIME` datetime,
`UPDATE_TIME` datetime DEFAULT NULL, `UPDATE_TIME` datetime,
`CHECK_TIME` datetime DEFAULT NULL, `CHECK_TIME` datetime,
`TABLE_COLLATION` varchar(32) DEFAULT NULL, `TABLE_COLLATION` varchar(32),
`CHECKSUM` bigint(21) unsigned DEFAULT NULL, `CHECKSUM` bigint(21) unsigned,
`CREATE_OPTIONS` varchar(2048) DEFAULT NULL, `CREATE_OPTIONS` varchar(2048),
`TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '', `TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1) DEFAULT NULL `TEMPORARY` varchar(1)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLES; SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
TABLE_TYPE varchar(64) NO TABLE_TYPE varchar(64) NO NULL
ENGINE varchar(64) YES NULL ENGINE varchar(64) YES NULL
VERSION bigint(21) unsigned YES NULL VERSION bigint(21) unsigned YES NULL
ROW_FORMAT varchar(10) YES NULL ROW_FORMAT varchar(10) YES NULL
...@@ -100,7 +100,7 @@ CHECK_TIME datetime YES NULL ...@@ -100,7 +100,7 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(32) YES NULL TABLE_COLLATION varchar(32) YES NULL
CHECKSUM bigint(21) unsigned YES NULL CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(2048) YES NULL CREATE_OPTIONS varchar(2048) YES NULL
TABLE_COMMENT varchar(2048) NO TABLE_COMMENT varchar(2048) NO NULL
MAX_INDEX_LENGTH bigint(21) unsigned YES NULL MAX_INDEX_LENGTH bigint(21) unsigned YES NULL
TEMPORARY varchar(1) YES NULL TEMPORARY varchar(1) YES NULL
SELECT table_catalog, table_schema, table_name SELECT table_catalog, table_schema, table_name
......
mysql-test/suite/funcs_1/r/is_triggers.result
View file @ da37bfd8
...@@ -30,78 +30,78 @@ DROP FUNCTION test.f1; ...@@ -30,78 +30,78 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TRIGGERS; DESCRIBE information_schema.TRIGGERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO TRIGGER_CATALOG varchar(512) NO NULL
TRIGGER_SCHEMA varchar(64) NO TRIGGER_SCHEMA varchar(64) NO NULL
TRIGGER_NAME varchar(64) NO TRIGGER_NAME varchar(64) NO NULL
EVENT_MANIPULATION varchar(6) NO EVENT_MANIPULATION varchar(6) NO NULL
EVENT_OBJECT_CATALOG varchar(512) NO EVENT_OBJECT_CATALOG varchar(512) NO NULL
EVENT_OBJECT_SCHEMA varchar(64) NO EVENT_OBJECT_SCHEMA varchar(64) NO NULL
EVENT_OBJECT_TABLE varchar(64) NO EVENT_OBJECT_TABLE varchar(64) NO NULL
ACTION_ORDER bigint(4) NO 0 ACTION_ORDER bigint(4) NO NULL
ACTION_CONDITION longtext YES NULL ACTION_CONDITION longtext YES NULL
ACTION_STATEMENT longtext NO ACTION_STATEMENT longtext NO NULL
ACTION_ORIENTATION varchar(9) NO ACTION_ORIENTATION varchar(9) NO NULL
ACTION_TIMING varchar(6) NO ACTION_TIMING varchar(6) NO NULL
ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL
ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL
ACTION_REFERENCE_OLD_ROW varchar(3) NO ACTION_REFERENCE_OLD_ROW varchar(3) NO NULL
ACTION_REFERENCE_NEW_ROW varchar(3) NO ACTION_REFERENCE_NEW_ROW varchar(3) NO NULL
CREATED datetime(2) YES NULL CREATED datetime(2) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SHOW CREATE TABLE information_schema.TRIGGERS; SHOW CREATE TABLE information_schema.TRIGGERS;
Table Create Table Table Create Table
TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` (
`TRIGGER_CATALOG` varchar(512) NOT NULL DEFAULT '', `TRIGGER_CATALOG` varchar(512) NOT NULL,
`TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TRIGGER_SCHEMA` varchar(64) NOT NULL,
`TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '', `TRIGGER_NAME` varchar(64) NOT NULL,
`EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '', `EVENT_MANIPULATION` varchar(6) NOT NULL,
`EVENT_OBJECT_CATALOG` varchar(512) NOT NULL DEFAULT '', `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL,
`EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL,
`EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '', `EVENT_OBJECT_TABLE` varchar(64) NOT NULL,
`ACTION_ORDER` bigint(4) NOT NULL DEFAULT 0, `ACTION_ORDER` bigint(4) NOT NULL,
`ACTION_CONDITION` longtext DEFAULT NULL, `ACTION_CONDITION` longtext,
`ACTION_STATEMENT` longtext NOT NULL DEFAULT '', `ACTION_STATEMENT` longtext NOT NULL,
`ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '', `ACTION_ORIENTATION` varchar(9) NOT NULL,
`ACTION_TIMING` varchar(6) NOT NULL DEFAULT '', `ACTION_TIMING` varchar(6) NOT NULL,
`ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL, `ACTION_REFERENCE_OLD_TABLE` varchar(64),
`ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL, `ACTION_REFERENCE_NEW_TABLE` varchar(64),
`ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '', `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL,
`ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '', `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL,
`CREATED` datetime(2) DEFAULT NULL, `CREATED` datetime(2),
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TRIGGERS; SHOW COLUMNS FROM information_schema.TRIGGERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO TRIGGER_CATALOG varchar(512) NO NULL
TRIGGER_SCHEMA varchar(64) NO TRIGGER_SCHEMA varchar(64) NO NULL
TRIGGER_NAME varchar(64) NO TRIGGER_NAME varchar(64) NO NULL
EVENT_MANIPULATION varchar(6) NO EVENT_MANIPULATION varchar(6) NO NULL
EVENT_OBJECT_CATALOG varchar(512) NO EVENT_OBJECT_CATALOG varchar(512) NO NULL
EVENT_OBJECT_SCHEMA varchar(64) NO EVENT_OBJECT_SCHEMA varchar(64) NO NULL
EVENT_OBJECT_TABLE varchar(64) NO EVENT_OBJECT_TABLE varchar(64) NO NULL
ACTION_ORDER bigint(4) NO 0 ACTION_ORDER bigint(4) NO NULL
ACTION_CONDITION longtext YES NULL ACTION_CONDITION longtext YES NULL
ACTION_STATEMENT longtext NO ACTION_STATEMENT longtext NO NULL
ACTION_ORIENTATION varchar(9) NO ACTION_ORIENTATION varchar(9) NO NULL
ACTION_TIMING varchar(6) NO ACTION_TIMING varchar(6) NO NULL
ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL
ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL
ACTION_REFERENCE_OLD_ROW varchar(3) NO ACTION_REFERENCE_OLD_ROW varchar(3) NO NULL
ACTION_REFERENCE_NEW_ROW varchar(3) NO ACTION_REFERENCE_NEW_ROW varchar(3) NO NULL
CREATED datetime(2) YES NULL CREATED datetime(2) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SELECT * FROM information_schema.triggers SELECT * FROM information_schema.triggers
WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
......
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
View file @ da37bfd8
...@@ -30,78 +30,78 @@ DROP FUNCTION test.f1; ...@@ -30,78 +30,78 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.TRIGGERS; DESCRIBE information_schema.TRIGGERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO TRIGGER_CATALOG varchar(512) NO NULL
TRIGGER_SCHEMA varchar(64) NO TRIGGER_SCHEMA varchar(64) NO NULL
TRIGGER_NAME varchar(64) NO TRIGGER_NAME varchar(64) NO NULL
EVENT_MANIPULATION varchar(6) NO EVENT_MANIPULATION varchar(6) NO NULL
EVENT_OBJECT_CATALOG varchar(512) NO EVENT_OBJECT_CATALOG varchar(512) NO NULL
EVENT_OBJECT_SCHEMA varchar(64) NO EVENT_OBJECT_SCHEMA varchar(64) NO NULL
EVENT_OBJECT_TABLE varchar(64) NO EVENT_OBJECT_TABLE varchar(64) NO NULL
ACTION_ORDER bigint(4) NO 0 ACTION_ORDER bigint(4) NO NULL
ACTION_CONDITION longtext YES NULL ACTION_CONDITION longtext YES NULL
ACTION_STATEMENT longtext NO ACTION_STATEMENT longtext NO NULL
ACTION_ORIENTATION varchar(9) NO ACTION_ORIENTATION varchar(9) NO NULL
ACTION_TIMING varchar(6) NO ACTION_TIMING varchar(6) NO NULL
ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL
ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL
ACTION_REFERENCE_OLD_ROW varchar(3) NO ACTION_REFERENCE_OLD_ROW varchar(3) NO NULL
ACTION_REFERENCE_NEW_ROW varchar(3) NO ACTION_REFERENCE_NEW_ROW varchar(3) NO NULL
CREATED datetime(2) YES NULL CREATED datetime(2) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SHOW CREATE TABLE information_schema.TRIGGERS; SHOW CREATE TABLE information_schema.TRIGGERS;
Table Create Table Table Create Table
TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` (
`TRIGGER_CATALOG` varchar(512) NOT NULL DEFAULT '', `TRIGGER_CATALOG` varchar(512) NOT NULL,
`TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TRIGGER_SCHEMA` varchar(64) NOT NULL,
`TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '', `TRIGGER_NAME` varchar(64) NOT NULL,
`EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '', `EVENT_MANIPULATION` varchar(6) NOT NULL,
`EVENT_OBJECT_CATALOG` varchar(512) NOT NULL DEFAULT '', `EVENT_OBJECT_CATALOG` varchar(512) NOT NULL,
`EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '', `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL,
`EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '', `EVENT_OBJECT_TABLE` varchar(64) NOT NULL,
`ACTION_ORDER` bigint(4) NOT NULL DEFAULT 0, `ACTION_ORDER` bigint(4) NOT NULL,
`ACTION_CONDITION` longtext DEFAULT NULL, `ACTION_CONDITION` longtext,
`ACTION_STATEMENT` longtext NOT NULL DEFAULT '', `ACTION_STATEMENT` longtext NOT NULL,
`ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '', `ACTION_ORIENTATION` varchar(9) NOT NULL,
`ACTION_TIMING` varchar(6) NOT NULL DEFAULT '', `ACTION_TIMING` varchar(6) NOT NULL,
`ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL, `ACTION_REFERENCE_OLD_TABLE` varchar(64),
`ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL, `ACTION_REFERENCE_NEW_TABLE` varchar(64),
`ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '', `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL,
`ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '', `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL,
`CREATED` datetime(2) DEFAULT NULL, `CREATED` datetime(2),
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '', `SQL_MODE` varchar(8192) NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TRIGGERS; SHOW COLUMNS FROM information_schema.TRIGGERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO TRIGGER_CATALOG varchar(512) NO NULL
TRIGGER_SCHEMA varchar(64) NO TRIGGER_SCHEMA varchar(64) NO NULL
TRIGGER_NAME varchar(64) NO TRIGGER_NAME varchar(64) NO NULL
EVENT_MANIPULATION varchar(6) NO EVENT_MANIPULATION varchar(6) NO NULL
EVENT_OBJECT_CATALOG varchar(512) NO EVENT_OBJECT_CATALOG varchar(512) NO NULL
EVENT_OBJECT_SCHEMA varchar(64) NO EVENT_OBJECT_SCHEMA varchar(64) NO NULL
EVENT_OBJECT_TABLE varchar(64) NO EVENT_OBJECT_TABLE varchar(64) NO NULL
ACTION_ORDER bigint(4) NO 0 ACTION_ORDER bigint(4) NO NULL
ACTION_CONDITION longtext YES NULL ACTION_CONDITION longtext YES NULL
ACTION_STATEMENT longtext NO ACTION_STATEMENT longtext NO NULL
ACTION_ORIENTATION varchar(9) NO ACTION_ORIENTATION varchar(9) NO NULL
ACTION_TIMING varchar(6) NO ACTION_TIMING varchar(6) NO NULL
ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL ACTION_REFERENCE_OLD_TABLE varchar(64) YES NULL
ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL ACTION_REFERENCE_NEW_TABLE varchar(64) YES NULL
ACTION_REFERENCE_OLD_ROW varchar(3) NO ACTION_REFERENCE_OLD_ROW varchar(3) NO NULL
ACTION_REFERENCE_NEW_ROW varchar(3) NO ACTION_REFERENCE_NEW_ROW varchar(3) NO NULL
CREATED datetime(2) YES NULL CREATED datetime(2) YES NULL
SQL_MODE varchar(8192) NO SQL_MODE varchar(8192) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
DATABASE_COLLATION varchar(32) NO DATABASE_COLLATION varchar(32) NO NULL
SELECT * FROM information_schema.triggers SELECT * FROM information_schema.triggers
WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
......
mysql-test/suite/funcs_1/r/is_user_privileges.result
View file @ da37bfd8
...@@ -28,24 +28,24 @@ DROP FUNCTION test.f1; ...@@ -28,24 +28,24 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.USER_PRIVILEGES; DESCRIBE information_schema.USER_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SHOW CREATE TABLE information_schema.USER_PRIVILEGES; SHOW CREATE TABLE information_schema.USER_PRIVILEGES;
Table Create Table Table Create Table
USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` ( USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
`GRANTEE` varchar(190) NOT NULL DEFAULT '', `GRANTEE` varchar(190) NOT NULL,
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '', `PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL DEFAULT '' `IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.USER_PRIVILEGES; SHOW COLUMNS FROM information_schema.USER_PRIVILEGES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
GRANTEE varchar(190) NO GRANTEE varchar(190) NO NULL
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
PRIVILEGE_TYPE varchar(64) NO PRIVILEGE_TYPE varchar(64) NO NULL
IS_GRANTABLE varchar(3) NO IS_GRANTABLE varchar(3) NO NULL
SELECT grantee, table_catalog, privilege_type SELECT grantee, table_catalog, privilege_type
FROM information_schema.user_privileges FROM information_schema.user_privileges
WHERE table_catalog IS NULL OR table_catalog <> 'def'; WHERE table_catalog IS NULL OR table_catalog <> 'def';
......
mysql-test/suite/funcs_1/r/is_views.result
View file @ da37bfd8
...@@ -28,45 +28,45 @@ DROP FUNCTION test.f1; ...@@ -28,45 +28,45 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.VIEWS; DESCRIBE information_schema.VIEWS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
VIEW_DEFINITION longtext NO VIEW_DEFINITION longtext NO NULL
CHECK_OPTION varchar(8) NO CHECK_OPTION varchar(8) NO NULL
IS_UPDATABLE varchar(3) NO IS_UPDATABLE varchar(3) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO NULL
SHOW CREATE TABLE information_schema.VIEWS; SHOW CREATE TABLE information_schema.VIEWS;
Table Create Table Table Create Table
VIEWS CREATE TEMPORARY TABLE `VIEWS` ( VIEWS CREATE TEMPORARY TABLE `VIEWS` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`VIEW_DEFINITION` longtext NOT NULL DEFAULT '', `VIEW_DEFINITION` longtext NOT NULL,
`CHECK_OPTION` varchar(8) NOT NULL DEFAULT '', `CHECK_OPTION` varchar(8) NOT NULL,
`IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '', `IS_UPDATABLE` varchar(3) NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`ALGORITHM` varchar(10) NOT NULL DEFAULT '' `ALGORITHM` varchar(10) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.VIEWS; SHOW COLUMNS FROM information_schema.VIEWS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
VIEW_DEFINITION longtext NO VIEW_DEFINITION longtext NO NULL
CHECK_OPTION varchar(8) NO CHECK_OPTION varchar(8) NO NULL
IS_UPDATABLE varchar(3) NO IS_UPDATABLE varchar(3) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO NULL
SELECT table_catalog, table_schema, table_name SELECT table_catalog, table_schema, table_name
FROM information_schema.views WHERE table_catalog IS NOT NULL; FROM information_schema.views WHERE table_catalog IS NOT NULL;
table_catalog table_schema table_name table_catalog table_schema table_name
......
mysql-test/suite/funcs_1/r/is_views_embedded.result
View file @ da37bfd8
...@@ -28,45 +28,45 @@ DROP FUNCTION test.f1; ...@@ -28,45 +28,45 @@ DROP FUNCTION test.f1;
######################################################################### #########################################################################
DESCRIBE information_schema.VIEWS; DESCRIBE information_schema.VIEWS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
VIEW_DEFINITION longtext NO VIEW_DEFINITION longtext NO NULL
CHECK_OPTION varchar(8) NO CHECK_OPTION varchar(8) NO NULL
IS_UPDATABLE varchar(3) NO IS_UPDATABLE varchar(3) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO NULL
SHOW CREATE TABLE information_schema.VIEWS; SHOW CREATE TABLE information_schema.VIEWS;
Table Create Table Table Create Table
VIEWS CREATE TEMPORARY TABLE `VIEWS` ( VIEWS CREATE TEMPORARY TABLE `VIEWS` (
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '', `TABLE_CATALOG` varchar(512) NOT NULL,
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '', `TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '', `TABLE_NAME` varchar(64) NOT NULL,
`VIEW_DEFINITION` longtext NOT NULL DEFAULT '', `VIEW_DEFINITION` longtext NOT NULL,
`CHECK_OPTION` varchar(8) NOT NULL DEFAULT '', `CHECK_OPTION` varchar(8) NOT NULL,
`IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '', `IS_UPDATABLE` varchar(3) NOT NULL,
`DEFINER` varchar(189) NOT NULL DEFAULT '', `DEFINER` varchar(189) NOT NULL,
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL,
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL,
`ALGORITHM` varchar(10) NOT NULL DEFAULT '' `ALGORITHM` varchar(10) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.VIEWS; SHOW COLUMNS FROM information_schema.VIEWS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO TABLE_CATALOG varchar(512) NO NULL
TABLE_SCHEMA varchar(64) NO TABLE_SCHEMA varchar(64) NO NULL
TABLE_NAME varchar(64) NO TABLE_NAME varchar(64) NO NULL
VIEW_DEFINITION longtext NO VIEW_DEFINITION longtext NO NULL
CHECK_OPTION varchar(8) NO CHECK_OPTION varchar(8) NO NULL
IS_UPDATABLE varchar(3) NO IS_UPDATABLE varchar(3) NO NULL
DEFINER varchar(189) NO DEFINER varchar(189) NO NULL
SECURITY_TYPE varchar(7) NO SECURITY_TYPE varchar(7) NO NULL
CHARACTER_SET_CLIENT varchar(32) NO CHARACTER_SET_CLIENT varchar(32) NO NULL
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO NULL
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO NULL
SELECT table_catalog, table_schema, table_name SELECT table_catalog, table_schema, table_name
FROM information_schema.views WHERE table_catalog IS NOT NULL; FROM information_schema.views WHERE table_catalog IS NOT NULL;
table_catalog table_schema table_name table_catalog table_schema table_name
......
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
View file @ da37bfd8
...@@ -24,24 +24,24 @@ connection default; ...@@ -24,24 +24,24 @@ connection default;
SHOW CREATE TABLE processlist; SHOW CREATE TABLE processlist;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Progress Id User Host db Command Time State Info Progress
...@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user. ...@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user.
SHOW CREATE TABLE processlist; SHOW CREATE TABLE processlist;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Progress Id User Host db Command Time State Info Progress
......
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
View file @ da37bfd8
...@@ -24,24 +24,24 @@ connection default; ...@@ -24,24 +24,24 @@ connection default;
SHOW CREATE TABLE processlist; SHOW CREATE TABLE processlist;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Progress Id User Host db Command Time State Info Progress
...@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user. ...@@ -104,24 +104,24 @@ SHOW/SELECT shows only the processes (1) of the user.
SHOW CREATE TABLE processlist; SHOW CREATE TABLE processlist;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Progress Id User Host db Command Time State Info Progress
......
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
View file @ da37bfd8
...@@ -12,24 +12,24 @@ USE test; ...@@ -12,24 +12,24 @@ USE test;
SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST; SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
# Ensure that the information about the own connection is correct. # Ensure that the information about the own connection is correct.
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/processlist_val_ps.result
View file @ da37bfd8
...@@ -12,24 +12,24 @@ USE test; ...@@ -12,24 +12,24 @@ USE test;
SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST; SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
Table Create Table Table Create Table
PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`ID` bigint(4) NOT NULL DEFAULT 0, `ID` bigint(4) NOT NULL,
`USER` varchar(128) NOT NULL DEFAULT '', `USER` varchar(128) NOT NULL,
`HOST` varchar(64) NOT NULL DEFAULT '', `HOST` varchar(64) NOT NULL,
`DB` varchar(64) DEFAULT NULL, `DB` varchar(64),
`COMMAND` varchar(16) NOT NULL DEFAULT '', `COMMAND` varchar(16) NOT NULL,
`TIME` int(7) NOT NULL DEFAULT 0, `TIME` int(7) NOT NULL,
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64),
`INFO` longtext DEFAULT NULL, `INFO` longtext,
`TIME_MS` decimal(22,3) NOT NULL DEFAULT 0.000, `TIME_MS` decimal(22,3) NOT NULL,
`STAGE` tinyint(2) NOT NULL DEFAULT 0, `STAGE` tinyint(2) NOT NULL,
`MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `MAX_STAGE` tinyint(2) NOT NULL,
`PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `PROGRESS` decimal(7,3) NOT NULL,
`MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MEMORY_USED` bigint(7) NOT NULL,
`MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `MAX_MEMORY_USED` bigint(7) NOT NULL,
`EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL,
`QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob DEFAULT NULL, `INFO_BINARY` blob,
`TID` bigint(4) NOT NULL DEFAULT 0 `TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
# Ensure that the information about the own connection is correct. # Ensure that the information about the own connection is correct.
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
......
mysql-test/suite/innodb/r/innodb_information_schema.result
View file @ da37bfd8
...@@ -22,28 +22,28 @@ lock_table COUNT(*) ...@@ -22,28 +22,28 @@ lock_table COUNT(*)
"test"."t_min" 2 "test"."t_min" 2
"test"."`t'\""_str" 10 "test"."`t'\""_str" 10
Field Type Null Key Default Extra Field Type Null Key Default Extra
trx_id varchar(18) NO trx_id varchar(18) NO NULL
trx_state varchar(13) NO trx_state varchar(13) NO NULL
trx_started datetime NO 0000-00-00 00:00:00 trx_started datetime NO NULL
trx_requested_lock_id varchar(81) YES NULL trx_requested_lock_id varchar(81) YES NULL
trx_wait_started datetime YES NULL trx_wait_started datetime YES NULL
trx_weight bigint(21) unsigned NO 0 trx_weight bigint(21) unsigned NO NULL
trx_mysql_thread_id bigint(21) unsigned NO 0 trx_mysql_thread_id bigint(21) unsigned NO NULL
trx_query varchar(1024) YES NULL trx_query varchar(1024) YES NULL
trx_operation_state varchar(64) YES NULL trx_operation_state varchar(64) YES NULL
trx_tables_in_use bigint(21) unsigned NO 0 trx_tables_in_use bigint(21) unsigned NO NULL
trx_tables_locked bigint(21) unsigned NO 0 trx_tables_locked bigint(21) unsigned NO NULL
trx_lock_structs bigint(21) unsigned NO 0 trx_lock_structs bigint(21) unsigned NO NULL
trx_lock_memory_bytes bigint(21) unsigned NO 0 trx_lock_memory_bytes bigint(21) unsigned NO NULL
trx_rows_locked bigint(21) unsigned NO 0 trx_rows_locked bigint(21) unsigned NO NULL
trx_rows_modified bigint(21) unsigned NO 0 trx_rows_modified bigint(21) unsigned NO NULL
trx_concurrency_tickets bigint(21) unsigned NO 0 trx_concurrency_tickets bigint(21) unsigned NO NULL
trx_isolation_level varchar(16) NO trx_isolation_level varchar(16) NO NULL
trx_unique_checks int(1) NO 0 trx_unique_checks int(1) NO NULL
trx_foreign_key_checks int(1) NO 0 trx_foreign_key_checks int(1) NO NULL
trx_last_foreign_key_error varchar(256) YES NULL trx_last_foreign_key_error varchar(256) YES NULL
trx_is_read_only int(1) NO 0 trx_is_read_only int(1) NO NULL
trx_autocommit_non_locking int(1) NO 0 trx_autocommit_non_locking int(1) NO NULL
trx_state trx_weight trx_tables_in_use trx_tables_locked trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_state trx_weight trx_tables_in_use trx_tables_locked trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks
RUNNING 3 0 1 6 1 0 REPEATABLE READ 1 1 RUNNING 3 0 1 6 1 0 REPEATABLE READ 1 1
trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_isolation_level trx_unique_checks trx_foreign_key_checks
......
mysql-test/suite/rpl/r/rpl_empty_string_is_null.result 0 → 100644
View file @ da37bfd8
include/master-slave.inc
[connection master]
#
# MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT
#
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
connection slave;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`TABLE_NAME` varchar(64) CHARACTER SET utf8 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
connection master;
DROP TABLE t1;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_empty_string_is_null.test 0 → 100644
View file @ da37bfd8
--source include/master-slave.inc
--source include/have_binlog_format_row.inc
--echo #
--echo # MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT
--echo #
SET SQL_MODE= 'EMPTY_STRING_IS_NULL';
CREATE TABLE t1 AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE 1 = 0;
--sync_slave_with_master
SHOW CREATE TABLE t1;
--connection master
DROP TABLE t1;
--source include/rpl_end.inc
plugin/disks/mysql-test/disks/disks.result
View file @ da37bfd8
show create table information_schema.disks; show create table information_schema.disks;
Table Create Table Table Create Table
DISKS CREATE TEMPORARY TABLE `DISKS` ( DISKS CREATE TEMPORARY TABLE `DISKS` (
`Disk` varchar(4096) NOT NULL DEFAULT '', `Disk` varchar(4096) NOT NULL,
`Path` varchar(4096) NOT NULL DEFAULT '', `Path` varchar(4096) NOT NULL,
`Total` bigint(32) NOT NULL DEFAULT 0, `Total` bigint(32) NOT NULL,
`Used` bigint(32) NOT NULL DEFAULT 0, `Used` bigint(32) NOT NULL,
`Available` bigint(32) NOT NULL DEFAULT 0 `Available` bigint(32) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
sum(Total) > sum(Available) sum(Total)>sum(Used) sum(Total) > sum(Available) sum(Total)>sum(Used)
......
plugin/query_response_time/mysql-test/query_response_time/basic.result
View file @ da37bfd8
...@@ -6,9 +6,9 @@ query_response_time_stats OFF ...@@ -6,9 +6,9 @@ query_response_time_stats OFF
SHOW CREATE TABLE INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; SHOW CREATE TABLE INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
Table Create Table Table Create Table
QUERY_RESPONSE_TIME CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` ( QUERY_RESPONSE_TIME CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` (
`TIME` varchar(14) NOT NULL DEFAULT '', `TIME` varchar(14) NOT NULL,
`COUNT` int(11) unsigned NOT NULL DEFAULT 0, `COUNT` int(11) unsigned NOT NULL,
`TOTAL` varchar(14) NOT NULL DEFAULT '' `TOTAL` varchar(14) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';; SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';;
PLUGIN_NAME QUERY_RESPONSE_TIME PLUGIN_NAME QUERY_RESPONSE_TIME
......
plugin/user_variables/mysql-test/user_variables/basic.result
View file @ da37bfd8
...@@ -11,10 +11,10 @@ PLUGIN_MATURITY Stable ...@@ -11,10 +11,10 @@ PLUGIN_MATURITY Stable
SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES; SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES;
Table Create Table Table Create Table
user_variables CREATE TEMPORARY TABLE `user_variables` ( user_variables CREATE TEMPORARY TABLE `user_variables` (
`VARIABLE_NAME` varchar(64) NOT NULL DEFAULT '', `VARIABLE_NAME` varchar(64) NOT NULL,
`VARIABLE_VALUE` varchar(2048) DEFAULT NULL, `VARIABLE_VALUE` varchar(2048),
`VARIABLE_TYPE` varchar(64) NOT NULL DEFAULT '', `VARIABLE_TYPE` varchar(64) NOT NULL,
`CHARACTER_SET_NAME` varchar(32) DEFAULT NULL `CHARACTER_SET_NAME` varchar(32)
) ENGINE=MEMORY DEFAULT CHARSET=utf8 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
FLUSH USER_VARIABLES; FLUSH USER_VARIABLES;
SELECT COUNT(*) FROM INFORMATION_SCHEMA.USER_VARIABLES; SELECT COUNT(*) FROM INFORMATION_SCHEMA.USER_VARIABLES;
......
sql/sql_select.cc
View file @ da37bfd8
...@@ -17850,8 +17850,15 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields, ...@@ -17850,8 +17850,15 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
The test for item->marker == 4 is ensure we don't create a group-by The test for item->marker == 4 is ensure we don't create a group-by
key over a bit field as heap tables can't handle that. key over a bit field as heap tables can't handle that.
*/ */
Field *new_field= (param->schema_table) ? Field *new_field;
item->create_field_for_schema(thd, table) : if (param->schema_table)
{
if ((new_field= item->create_field_for_schema(thd, table)))
new_field->flags|= NO_DEFAULT_VALUE_FLAG;
}
else
{
new_field=
create_tmp_field(thd, table, item, type, &copy_func, create_tmp_field(thd, table, item, type, &copy_func,
tmp_from_field, &default_field[fieldnr], tmp_from_field, &default_field[fieldnr],
group != 0, group != 0,
...@@ -17866,7 +17873,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields, ...@@ -17866,7 +17873,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
*/ */
item->marker == 4 || param->bit_fields_as_long, item->marker == 4 || param->bit_fields_as_long,
force_copy_fields); force_copy_fields);
}
if (unlikely(!new_field)) if (unlikely(!new_field))
{ {
if (unlikely(thd->is_fatal_error)) if (unlikely(thd->is_fatal_error))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7