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

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-02-15 10:22:03 +02:00
parent b782971c58 dc09f8f29c
commit b006d2ead4
583 changed files with 17039 additions and 5592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
mysql-test/suite/funcs_1/r/is_tables_mysql.result
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;