mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
MDEV-32026 lowercase_table2.test failures in 11.3
Also fixes MDEV-32025 Crashes in MDL_key::mdl_key_init with lower-case-table-names=2 Change overview: - In changes made in MDEV-31948, MDEV-31982 the code path which originaly worked only in case of lower-case-table-names==1 also started to work in case of lower-case-table-names==2 in a mistake. Restoring the original check_db_name() compatible behavior (but without re-using check_db_name() itself). - MDEV-31978 erroneously added a wrong DBUG_ASSERT. Removing. Details: - In mysql_change_db() the database name should be lower-cased only in case of lower_case_table_names==1. It should not be lower-cased for lower_case_table_names==2. The problem was caused by MDEV-31948. The new code version restored the pre-MDEV-31948 behavior, which used check_db_name() behavior. - Passing lower_case_table_names==1 instead of just lower_case_table_names to the "casedn" parameter to DBNameBuffer constructor in sql_parse.cc The database name should not be lower-cased for lower_case_table_names==2. This restores pre-MDEV-31982 behavioir which used check_db_name() here. - Adding a new data type Lex_ident_db_normalized, it stores database names which are both checked and normalized to lower case in case lower_case_table_names==1 and lower_case_table_names==2. - Changing the data type for the "db" parameter to Lex_ident_db_normalized in lock_schema_name(), lock_db_routines(), find_db_tables_and_rm_known_files(). This is to avoid incorrectly passing a non-normalized name in the future. - Restoring the database name normalization in mysql_create_db_internal() and mysql_rm_db_internal() before calling lock_schema_name(). The problem was caused MDEV-31982. - Adding database name normalization in mysql_alter_db_internal() and mysql_upgrade_db(). This fixes MDEV-32026. - Removing a wrong assert in Create_sp_func::create_with_db() was incorrect: DBUG_ASSERT(Lex_ident_fs(*db).ok_for_lower_case_names()); The database name comes to here checked, but not normalized to lower case with lower-case-table-names=2. The assert was erroneously added by MDEV-31978. - Recording lowercase_tables2.results and lowercase_tables4.results according to MDEV-29446 Change SHOW CREATE TABLE to display default collations These tests are skipped on buildbot on all platforms, so this change was forgotten in the patch for MDEV-29446.
This commit is contained in:
@@ -4900,7 +4900,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
|
||||
break;
|
||||
case SQLCOM_CREATE_DB:
|
||||
{
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names);
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names == 1);
|
||||
const Lex_ident_db db= dbbuf.to_lex_ident_db_with_error();
|
||||
|
||||
if (!db.str ||
|
||||
@@ -4921,7 +4921,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
|
||||
if (thd->variables.option_bits & OPTION_IF_EXISTS)
|
||||
lex->create_info.set(DDL_options_st::OPT_IF_EXISTS);
|
||||
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names);
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names == 1);
|
||||
const Lex_ident_db db= dbbuf.to_lex_ident_db_with_error();
|
||||
|
||||
if (!db.str || prepare_db_action(thd, DROP_ACL, db))
|
||||
@@ -4934,7 +4934,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
|
||||
}
|
||||
case SQLCOM_ALTER_DB_UPGRADE:
|
||||
{
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names);
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names == 1);
|
||||
const Lex_ident_db db= dbbuf.to_lex_ident_db_with_error();
|
||||
|
||||
if (!db.str ||
|
||||
@@ -4956,7 +4956,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
|
||||
}
|
||||
case SQLCOM_ALTER_DB:
|
||||
{
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names);
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names == 1);
|
||||
const Lex_ident_db db= dbbuf.to_lex_ident_db_with_error();
|
||||
|
||||
if (!db.str ||
|
||||
@@ -6236,7 +6236,7 @@ show_create_db(THD *thd, LEX *lex)
|
||||
DBUG_EXECUTE_IF("4x_server_emul",
|
||||
my_error(ER_UNKNOWN_ERROR, MYF(0)); return 1;);
|
||||
|
||||
DBNameBuffer dbbuf(lex->name, lower_case_table_names);
|
||||
const DBNameBuffer dbbuf(lex->name, lower_case_table_names == 1);
|
||||
if (Lex_ident_fs(dbbuf.to_lex_cstring()).check_db_name_with_error())
|
||||
return 1;
|
||||
LEX_CSTRING db= dbbuf.to_lex_cstring();
|
||||
|
Reference in New Issue
Block a user