mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge branch '10.3' into 10.4
This commit is contained in:
@ -29,12 +29,12 @@ DROP FUNCTION test.f1;
|
||||
#########################################################################
|
||||
DESCRIBE information_schema.ROUTINES;
|
||||
Field Type Null Key Default Extra
|
||||
SPECIFIC_NAME varchar(64) NO
|
||||
ROUTINE_CATALOG varchar(512) NO
|
||||
ROUTINE_SCHEMA varchar(64) NO
|
||||
ROUTINE_NAME varchar(64) NO
|
||||
ROUTINE_TYPE varchar(13) NO
|
||||
DATA_TYPE varchar(64) NO
|
||||
SPECIFIC_NAME varchar(64) NO NULL
|
||||
ROUTINE_CATALOG varchar(512) NO NULL
|
||||
ROUTINE_SCHEMA varchar(64) NO NULL
|
||||
ROUTINE_NAME varchar(64) NO NULL
|
||||
ROUTINE_TYPE varchar(13) NO NULL
|
||||
DATA_TYPE varchar(64) NO NULL
|
||||
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
|
||||
CHARACTER_OCTET_LENGTH int(21) YES NULL
|
||||
NUMERIC_PRECISION int(21) YES NULL
|
||||
@ -43,66 +43,66 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
|
||||
CHARACTER_SET_NAME varchar(64) YES NULL
|
||||
COLLATION_NAME varchar(64) YES NULL
|
||||
DTD_IDENTIFIER longtext YES NULL
|
||||
ROUTINE_BODY varchar(8) NO
|
||||
ROUTINE_BODY varchar(8) NO NULL
|
||||
ROUTINE_DEFINITION longtext YES NULL
|
||||
EXTERNAL_NAME varchar(64) YES NULL
|
||||
EXTERNAL_LANGUAGE varchar(64) YES NULL
|
||||
PARAMETER_STYLE varchar(8) NO
|
||||
IS_DETERMINISTIC varchar(3) NO
|
||||
SQL_DATA_ACCESS varchar(64) NO
|
||||
PARAMETER_STYLE varchar(8) NO NULL
|
||||
IS_DETERMINISTIC varchar(3) NO NULL
|
||||
SQL_DATA_ACCESS varchar(64) NO NULL
|
||||
SQL_PATH varchar(64) YES NULL
|
||||
SECURITY_TYPE varchar(7) NO
|
||||
CREATED datetime NO 0000-00-00 00:00:00
|
||||
LAST_ALTERED datetime NO 0000-00-00 00:00:00
|
||||
SQL_MODE varchar(8192) NO
|
||||
ROUTINE_COMMENT longtext NO
|
||||
DEFINER varchar(189) NO
|
||||
CHARACTER_SET_CLIENT varchar(32) NO
|
||||
COLLATION_CONNECTION varchar(32) NO
|
||||
DATABASE_COLLATION varchar(32) NO
|
||||
SECURITY_TYPE varchar(7) NO NULL
|
||||
CREATED datetime NO NULL
|
||||
LAST_ALTERED datetime NO NULL
|
||||
SQL_MODE varchar(8192) NO NULL
|
||||
ROUTINE_COMMENT longtext NO NULL
|
||||
DEFINER varchar(189) NO NULL
|
||||
CHARACTER_SET_CLIENT varchar(32) NO NULL
|
||||
COLLATION_CONNECTION varchar(32) NO NULL
|
||||
DATABASE_COLLATION varchar(32) NO NULL
|
||||
SHOW CREATE TABLE information_schema.ROUTINES;
|
||||
Table Create Table
|
||||
ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
|
||||
`SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
|
||||
`ROUTINE_CATALOG` varchar(512) NOT NULL DEFAULT '',
|
||||
`ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
|
||||
`ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
|
||||
`ROUTINE_TYPE` varchar(13) NOT NULL DEFAULT '',
|
||||
`DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
|
||||
`CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL,
|
||||
`CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL,
|
||||
`NUMERIC_PRECISION` int(21) DEFAULT NULL,
|
||||
`NUMERIC_SCALE` int(21) DEFAULT NULL,
|
||||
`DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
|
||||
`CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
|
||||
`COLLATION_NAME` varchar(64) DEFAULT NULL,
|
||||
`DTD_IDENTIFIER` longtext DEFAULT NULL,
|
||||
`ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
|
||||
`ROUTINE_DEFINITION` longtext DEFAULT NULL,
|
||||
`EXTERNAL_NAME` varchar(64) DEFAULT NULL,
|
||||
`EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
|
||||
`PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
|
||||
`IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
|
||||
`SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
|
||||
`SQL_PATH` varchar(64) DEFAULT NULL,
|
||||
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
|
||||
`CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
|
||||
`ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
|
||||
`DEFINER` varchar(189) NOT NULL DEFAULT '',
|
||||
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
|
||||
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
|
||||
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
|
||||
`SPECIFIC_NAME` varchar(64) NOT NULL,
|
||||
`ROUTINE_CATALOG` varchar(512) NOT NULL,
|
||||
`ROUTINE_SCHEMA` varchar(64) NOT NULL,
|
||||
`ROUTINE_NAME` varchar(64) NOT NULL,
|
||||
`ROUTINE_TYPE` varchar(13) NOT NULL,
|
||||
`DATA_TYPE` varchar(64) NOT NULL,
|
||||
`CHARACTER_MAXIMUM_LENGTH` int(21),
|
||||
`CHARACTER_OCTET_LENGTH` int(21),
|
||||
`NUMERIC_PRECISION` int(21),
|
||||
`NUMERIC_SCALE` int(21),
|
||||
`DATETIME_PRECISION` bigint(21) unsigned,
|
||||
`CHARACTER_SET_NAME` varchar(64),
|
||||
`COLLATION_NAME` varchar(64),
|
||||
`DTD_IDENTIFIER` longtext,
|
||||
`ROUTINE_BODY` varchar(8) NOT NULL,
|
||||
`ROUTINE_DEFINITION` longtext,
|
||||
`EXTERNAL_NAME` varchar(64),
|
||||
`EXTERNAL_LANGUAGE` varchar(64),
|
||||
`PARAMETER_STYLE` varchar(8) NOT NULL,
|
||||
`IS_DETERMINISTIC` varchar(3) NOT NULL,
|
||||
`SQL_DATA_ACCESS` varchar(64) NOT NULL,
|
||||
`SQL_PATH` varchar(64),
|
||||
`SECURITY_TYPE` varchar(7) NOT NULL,
|
||||
`CREATED` datetime NOT NULL,
|
||||
`LAST_ALTERED` datetime NOT NULL,
|
||||
`SQL_MODE` varchar(8192) NOT NULL,
|
||||
`ROUTINE_COMMENT` longtext NOT NULL,
|
||||
`DEFINER` varchar(189) NOT NULL,
|
||||
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
|
||||
`COLLATION_CONNECTION` varchar(32) NOT NULL,
|
||||
`DATABASE_COLLATION` varchar(32) NOT NULL
|
||||
) DEFAULT CHARSET=utf8
|
||||
SHOW COLUMNS FROM information_schema.ROUTINES;
|
||||
Field Type Null Key Default Extra
|
||||
SPECIFIC_NAME varchar(64) NO
|
||||
ROUTINE_CATALOG varchar(512) NO
|
||||
ROUTINE_SCHEMA varchar(64) NO
|
||||
ROUTINE_NAME varchar(64) NO
|
||||
ROUTINE_TYPE varchar(13) NO
|
||||
DATA_TYPE varchar(64) NO
|
||||
SPECIFIC_NAME varchar(64) NO NULL
|
||||
ROUTINE_CATALOG varchar(512) NO NULL
|
||||
ROUTINE_SCHEMA varchar(64) NO NULL
|
||||
ROUTINE_NAME varchar(64) NO NULL
|
||||
ROUTINE_TYPE varchar(13) NO NULL
|
||||
DATA_TYPE varchar(64) NO NULL
|
||||
CHARACTER_MAXIMUM_LENGTH int(21) YES NULL
|
||||
CHARACTER_OCTET_LENGTH int(21) YES NULL
|
||||
NUMERIC_PRECISION int(21) YES NULL
|
||||
@ -111,23 +111,23 @@ DATETIME_PRECISION bigint(21) unsigned YES NULL
|
||||
CHARACTER_SET_NAME varchar(64) YES NULL
|
||||
COLLATION_NAME varchar(64) YES NULL
|
||||
DTD_IDENTIFIER longtext YES NULL
|
||||
ROUTINE_BODY varchar(8) NO
|
||||
ROUTINE_BODY varchar(8) NO NULL
|
||||
ROUTINE_DEFINITION longtext YES NULL
|
||||
EXTERNAL_NAME varchar(64) YES NULL
|
||||
EXTERNAL_LANGUAGE varchar(64) YES NULL
|
||||
PARAMETER_STYLE varchar(8) NO
|
||||
IS_DETERMINISTIC varchar(3) NO
|
||||
SQL_DATA_ACCESS varchar(64) NO
|
||||
PARAMETER_STYLE varchar(8) NO NULL
|
||||
IS_DETERMINISTIC varchar(3) NO NULL
|
||||
SQL_DATA_ACCESS varchar(64) NO NULL
|
||||
SQL_PATH varchar(64) YES NULL
|
||||
SECURITY_TYPE varchar(7) NO
|
||||
CREATED datetime NO 0000-00-00 00:00:00
|
||||
LAST_ALTERED datetime NO 0000-00-00 00:00:00
|
||||
SQL_MODE varchar(8192) NO
|
||||
ROUTINE_COMMENT longtext NO
|
||||
DEFINER varchar(189) NO
|
||||
CHARACTER_SET_CLIENT varchar(32) NO
|
||||
COLLATION_CONNECTION varchar(32) NO
|
||||
DATABASE_COLLATION varchar(32) NO
|
||||
SECURITY_TYPE varchar(7) NO NULL
|
||||
CREATED datetime NO NULL
|
||||
LAST_ALTERED datetime NO NULL
|
||||
SQL_MODE varchar(8192) NO NULL
|
||||
ROUTINE_COMMENT longtext NO NULL
|
||||
DEFINER varchar(189) NO NULL
|
||||
CHARACTER_SET_CLIENT varchar(32) NO NULL
|
||||
COLLATION_CONNECTION varchar(32) NO NULL
|
||||
DATABASE_COLLATION varchar(32) NO NULL
|
||||
USE test;
|
||||
DROP PROCEDURE IF EXISTS sp_for_routines;
|
||||
DROP FUNCTION IF EXISTS function_for_routines;
|
||||
|
Reference in New Issue
Block a user