mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge with 3.23 to get:
- Fix for empty table/column names mysql-test/t/create.test: Auto merged sql/sql_parse.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/table.cc: Auto merged tests/grant.pl: Auto merged sql/filesort.cc: merge with 3.23 sql/sql_table.cc: merge with 3.23 tests/grant.res: merge with 3.23
This commit is contained in:
@ -3218,8 +3218,7 @@ TABLE_LIST *add_table_to_list(Table_ident *table, LEX_STRING *alias,
|
||||
if (!table)
|
||||
DBUG_RETURN(0); // End of memory
|
||||
alias_str= alias ? alias->str : table->table.str;
|
||||
if (table->table.length > NAME_LEN ||
|
||||
check_table_name(table->table.str,table->table.length) ||
|
||||
if (check_table_name(table->table.str,table->table.length) ||
|
||||
table->db.str && check_db_name(table->db.str))
|
||||
{
|
||||
net_printf(&thd->net,ER_WRONG_TABLE_NAME,table->table.str);
|
||||
|
Reference in New Issue
Block a user