1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge bb-10.2-ext into 10.3

This commit is contained in:
Marko Mäkelä
2018-02-15 10:22:03 +02:00
583 changed files with 17039 additions and 5592 deletions

View File

@ -31,6 +31,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Column privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -54,6 +56,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Columns
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -77,6 +81,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Database privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -100,6 +106,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Events
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -123,6 +131,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment User defined functions
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -146,6 +156,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment General log
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -169,6 +181,8 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Replication slave GTID position
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -192,6 +206,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help categories
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -215,6 +231,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help keywords
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -238,6 +256,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment keyword-topic relation
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -261,6 +281,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help topics
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -284,6 +306,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Host privileges; Merged with database privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -307,6 +331,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Indexes
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -330,6 +356,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -353,6 +381,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -376,6 +406,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment MySQL plugins
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -399,6 +431,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Stored Procedures
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -422,6 +456,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Procedure privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -445,6 +481,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment User proxy privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -468,6 +506,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Granted roles
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -491,6 +531,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment MySQL Foreign Servers table
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -514,6 +556,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Slow log
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -537,6 +581,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Table privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -560,6 +606,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Tables
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -583,6 +631,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zones
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -606,6 +656,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Leap seconds information for time zones
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -629,6 +681,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone names
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -652,6 +706,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone transitions
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -675,6 +731,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone transition types
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -698,6 +756,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -721,6 +781,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Users and global privileges
Separator -----------------------------------------------------
DROP USER testuser1@localhost;
@ -758,6 +820,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Column privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -781,6 +845,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Columns
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -804,6 +870,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Database privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -827,6 +895,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Events
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -850,6 +920,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment User defined functions
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -873,6 +945,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment General log
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -896,6 +970,8 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Replication slave GTID position
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -919,6 +995,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help categories
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -942,6 +1020,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help keywords
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -965,6 +1045,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment keyword-topic relation
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -988,6 +1070,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment help topics
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1011,6 +1095,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Host privileges; Merged with database privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1034,6 +1120,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Indexes
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1057,6 +1145,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1080,6 +1170,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1103,6 +1195,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment MySQL plugins
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1126,6 +1220,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Stored Procedures
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1149,6 +1245,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Procedure privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1172,6 +1270,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment User proxy privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1195,6 +1295,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Granted roles
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1218,6 +1320,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment MySQL Foreign Servers table
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1241,6 +1345,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Slow log
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1264,6 +1370,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Table privileges
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1287,6 +1395,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Statistics on Tables
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1310,6 +1420,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zones
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1333,6 +1445,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Leap seconds information for time zones
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1356,6 +1470,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone names
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1379,6 +1495,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone transitions
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1402,6 +1520,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Time zone transition types
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1425,6 +1545,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
@ -1448,6 +1570,8 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY N
user_comment Users and global privileges
Separator -----------------------------------------------------
connection default;