mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2022-09-13 16:36:38 +03:00
commit 18795f5512
1127 changed files with 48150 additions and 48034 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
View file

@ -367,7 +367,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f1` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
insert into t1 values (1);
create trigger tr1 after insert on t1
for each row insert into t2 (f2) values (new.f1+1);

2
mysql-test/suite/funcs_1/r/is_character_sets.result
View file

@ -39,7 +39,7 @@ CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`DEFAULT_COLLATE_NAME` varchar(32) NOT NULL,
`DESCRIPTION` varchar(60) NOT NULL,
`MAXLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.CHARACTER_SETS;
Field Type Null Key Default Extra
CHARACTER_SET_NAME varchar(32) NO NULL

2
mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
View file

@ -35,7 +35,7 @@ Table Create Table
COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
`COLLATION_NAME` varchar(32) NOT NULL,
`CHARACTER_SET_NAME` varchar(32) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO NULL

2
mysql-test/suite/funcs_1/r/is_collations.result
View file

@ -43,7 +43,7 @@ COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` (
`IS_DEFAULT` varchar(3) NOT NULL,
`IS_COMPILED` varchar(3) NOT NULL,
`SORTLEN` bigint(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.COLLATIONS;
Field Type Null Key Default Extra
COLLATION_NAME varchar(32) NO NULL

2
mysql-test/suite/funcs_1/r/is_column_privileges.result
View file

@ -45,7 +45,7 @@ COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
`COLUMN_NAME` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(190) NO NULL

2
mysql-test/suite/funcs_1/r/is_columns.result
View file

@ -75,7 +75,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` (
`COLUMN_COMMENT` varchar(1024) NOT NULL,
`IS_GENERATED` varchar(6) NOT NULL,
`GENERATION_EXPRESSION` longtext
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.COLUMNS;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_engines.result
View file

@ -43,7 +43,7 @@ ENGINES CREATE TEMPORARY TABLE `ENGINES` (
`TRANSACTIONS` varchar(3),
`XA` varchar(3),
`SAVEPOINTS` varchar(3)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.ENGINES;
Field Type Null Key Default Extra
ENGINE varchar(64) NO NULL

2
mysql-test/suite/funcs_1/r/is_events.result
View file

@ -79,7 +79,7 @@ EVENTS CREATE TEMPORARY TABLE `EVENTS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.EVENTS;
Field Type Null Key Default Extra
EVENT_CATALOG varchar(64) NO NULL

2
mysql-test/suite/funcs_1/r/is_key_column_usage.result
View file

@ -55,7 +55,7 @@ KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
`REFERENCED_TABLE_SCHEMA` varchar(64),
`REFERENCED_TABLE_NAME` varchar(64),
`REFERENCED_COLUMN_NAME` varchar(64)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
View file

@ -55,7 +55,7 @@ KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
`REFERENCED_TABLE_SCHEMA` varchar(64),
`REFERENCED_TABLE_NAME` varchar(64),
`REFERENCED_COLUMN_NAME` varchar(64)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_routines.result
View file

@ -94,7 +94,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.ROUTINES;
Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO NULL

2
mysql-test/suite/funcs_1/r/is_routines_embedded.result
View file

@ -94,7 +94,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.ROUTINES;
Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO NULL

2
mysql-test/suite/funcs_1/r/is_schema_privileges.result
View file

@ -41,7 +41,7 @@ SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
`TABLE_SCHEMA` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(190) NO NULL

2
mysql-test/suite/funcs_1/r/is_schemata.result
View file

@ -41,7 +41,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
`SQL_PATH` varchar(512)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
View file

@ -41,7 +41,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL,
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL,
`SQL_PATH` varchar(512)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra
CATALOG_NAME varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_statistics.result
View file

@ -63,7 +63,7 @@ STATISTICS CREATE TEMPORARY TABLE `STATISTICS` (
`INDEX_TYPE` varchar(16) NOT NULL,
`COMMENT` varchar(16),
`INDEX_COMMENT` varchar(1024) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.STATISTICS;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_table_constraints.result
View file

@ -43,7 +43,7 @@ TABLE_CONSTRAINTS CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
`TABLE_SCHEMA` varchar(64) NOT NULL,
`TABLE_NAME` varchar(64) NOT NULL,
`CONSTRAINT_TYPE` varchar(64) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS;
Field Type Null Key Default Extra
CONSTRAINT_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_table_privileges.result
View file

@ -43,7 +43,7 @@ TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
`TABLE_NAME` varchar(64) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(190) NO NULL

2
mysql-test/suite/funcs_1/r/is_tables.result
View file

@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_tables_embedded.result
View file

@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1)
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_triggers.result
View file

@ -77,7 +77,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TRIGGERS;
Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
View file

@ -77,7 +77,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`DATABASE_COLLATION` varchar(32) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.TRIGGERS;
Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_user_privileges.result
View file

@ -39,7 +39,7 @@ USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
`TABLE_CATALOG` varchar(512) NOT NULL,
`PRIVILEGE_TYPE` varchar(64) NOT NULL,
`IS_GRANTABLE` varchar(3) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.USER_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(190) NO NULL

2
mysql-test/suite/funcs_1/r/is_views.result
View file

@ -53,7 +53,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`ALGORITHM` varchar(10) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.VIEWS;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/is_views_embedded.result
View file

@ -53,7 +53,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL,
`COLLATION_CONNECTION` varchar(32) NOT NULL,
`ALGORITHM` varchar(10) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW COLUMNS FROM information_schema.VIEWS;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL

2
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
View file

@ -372,7 +372,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f1` int(11) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
insert into t1 values (1);
create trigger tr1 after insert on t1
for each row insert into t2 (f2) values (new.f1+1);

2
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
View file

@ -372,7 +372,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
insert into t1 values (1);
create trigger tr1 after insert on t1
for each row insert into t2 (f2) values (new.f1+1);

4
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
View file

@ -42,7 +42,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW processlist;
Id User Host db Command Time State Info Progress
ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS
@ -122,7 +122,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW processlist;
Id User Host db Command Time State Info Progress
ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS

4
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
View file

@ -42,7 +42,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW processlist;
Id User Host db Command Time State Info Progress
ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS
@ -122,7 +122,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
SHOW processlist;
Id User Host db Command Time State Info Progress
ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS

2
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
View file

@ -30,7 +30,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
# Ensure that the information about the own connection is correct.
#--------------------------------------------------------------------------

2
mysql-test/suite/funcs_1/r/processlist_val_ps.result
View file

@ -30,7 +30,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`QUERY_ID` bigint(4) NOT NULL,
`INFO_BINARY` blob,
`TID` bigint(4) NOT NULL
) DEFAULT CHARSET=utf8
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
# Ensure that the information about the own connection is correct.
#--------------------------------------------------------------------------

2
mysql-test/suite/funcs_1/r/storedproc.result
View file

@ -1689,7 +1689,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
return concat('hello, ', s, '!');
show CREATE FUNCTION fn1;
Function sql_mode Create Function character_set_client collation_connection Database Collation
fn1 CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50) CHARSET latin1
fn1 CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50) CHARSET latin1 COLLATE latin1_swedish_ci
return concat('hello, ', s, '!') latin1 <modified> <created>
DROP FUNCTION fn1;