Merge branch 10.3 into 10.4
This commit is contained in:
commit
95e9f3c186
@ -458,6 +458,8 @@ TABLE_COLLATION utf8_general_ci
|
||||
CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT #TC#
|
||||
MAX_INDEX_LENGTH #MIL#
|
||||
TEMPORARY Y
|
||||
user_comment
|
||||
Separator -----------------------------------------------------
|
||||
TABLE_CATALOG def
|
||||
@ -831,6 +833,8 @@ TABLE_COLLATION utf8_general_ci
|
||||
CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT #TC#
|
||||
MAX_INDEX_LENGTH #MIL#
|
||||
TEMPORARY Y
|
||||
user_comment
|
||||
Separator -----------------------------------------------------
|
||||
TABLE_CATALOG def
|
||||
@ -1570,6 +1574,8 @@ TABLE_COLLATION utf8_general_ci
|
||||
CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT #TC#
|
||||
MAX_INDEX_LENGTH #MIL#
|
||||
TEMPORARY Y
|
||||
user_comment
|
||||
Separator -----------------------------------------------------
|
||||
TABLE_CATALOG def
|
||||
@ -1943,6 +1949,8 @@ TABLE_COLLATION utf8_general_ci
|
||||
CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT #TC#
|
||||
MAX_INDEX_LENGTH #MIL#
|
||||
TEMPORARY Y
|
||||
user_comment
|
||||
Separator -----------------------------------------------------
|
||||
TABLE_CATALOG def
|
||||
|
@ -45,6 +45,7 @@ INNODB_SYS_INDEXES
|
||||
INNODB_SYS_TABLES
|
||||
INNODB_SYS_VIRTUAL
|
||||
INNODB_TRX
|
||||
KEYWORDS
|
||||
KEY_CACHES
|
||||
KEY_COLUMN_USAGE
|
||||
OPTIMIZER_TRACE
|
||||
@ -60,6 +61,7 @@ SCHEMA_PRIVILEGES
|
||||
SESSION_STATUS
|
||||
SESSION_VARIABLES
|
||||
SPATIAL_REF_SYS
|
||||
SQL_FUNCTIONS
|
||||
STATISTICS
|
||||
SYSTEM_VARIABLES
|
||||
TABLES
|
||||
|
@ -7957,7 +7957,7 @@ int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond)
|
||||
int add_symbol_to_table(const char* name, TABLE* 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,
|
||||
// please increase the defined max length
|
||||
|
Loading…
x
Reference in New Issue
Block a user