1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 10.3 into 10.4

Browse Source
This commit is contained in:
Daniel Black 2021-07-02 17:17:33 +10:00
commit 95e9f3c186
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/funcs_1/r/is_tables_is.result
View File

@ -458,6 +458,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -831,6 +833,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -1570,6 +1574,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -1943,6 +1949,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def

2
mysql-test/suite/sql_sequence/rebuild.result
View File

@ -45,6 +45,7 @@ INNODB_SYS_INDEXES
INNODB_SYS_TABLES INNODB_SYS_TABLES
INNODB_SYS_VIRTUAL INNODB_SYS_VIRTUAL
INNODB_TRX INNODB_TRX
KEYWORDS
KEY_CACHES KEY_CACHES
KEY_COLUMN_USAGE KEY_COLUMN_USAGE
OPTIMIZER_TRACE OPTIMIZER_TRACE
@ -60,6 +61,7 @@ SCHEMA_PRIVILEGES
SESSION_STATUS SESSION_STATUS
SESSION_VARIABLES SESSION_VARIABLES
SPATIAL_REF_SYS SPATIAL_REF_SYS
SQL_FUNCTIONS
STATISTICS STATISTICS
SYSTEM_VARIABLES SYSTEM_VARIABLES
TABLES TABLES

2
sql/sql_show.cc
View File

@ -7957,7 +7957,7 @@ int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond)
int add_symbol_to_table(const char* name, TABLE* table){ int add_symbol_to_table(const char* name, TABLE* table){
DBUG_ENTER("add_symbol_to_table"); DBUG_ENTER("add_symbol_to_table");
uint length= strlen(name); size_t length= strlen(name);
// If you've added a new SQL keyword longer than KEYWORD_SIZE, // If you've added a new SQL keyword longer than KEYWORD_SIZE,
// please increase the defined max length // please increase the defined max length