1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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:
Alexander Barkov
2023-08-28 15:07:19 +04:00
parent cb37c99dd8
commit 9cb75f333f
13 changed files with 151 additions and 40 deletions

View File

@ -55,7 +55,8 @@ const char *del_exts[]= {".BAK", ".opt", NullS};
static TYPELIB deletable_extensions=
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
static bool find_db_tables_and_rm_known_files(THD *, MY_DIR *, const char *,
static bool find_db_tables_and_rm_known_files(THD *, MY_DIR *,
const Lex_ident_db_normalized &db,
const char *, TABLE_LIST **);
long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
@ -744,7 +745,10 @@ mysql_create_db_internal(THD *thd, const Lex_ident_db &db,
DBUG_RETURN(-1);
}
if (lock_schema_name(thd, db.str))
const DBNameBuffer dbnorm_buffer(db, lower_case_table_names);
Lex_ident_db_normalized dbnorm(dbnorm_buffer.to_lex_cstring());
if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(-1);
/* Check directory */
@ -880,7 +884,10 @@ mysql_alter_db_internal(THD *thd, const Lex_ident_db &db,
int error= 0;
DBUG_ENTER("mysql_alter_db");
if (lock_schema_name(thd, db.str))
const DBNameBuffer dbnorm_buffer(db, lower_case_table_names);
Lex_ident_db_normalized dbnorm(dbnorm_buffer.to_lex_cstring());
if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(TRUE);
/*
@ -1046,9 +1053,11 @@ mysql_rm_db_internal(THD *thd, const Lex_ident_db &db, bool if_exists,
Drop_table_error_handler err_handler;
DBUG_ENTER("mysql_rm_db");
const DBNameBuffer dbnorm_buffer(db, lower_case_table_names);
Lex_ident_db_normalized dbnorm(dbnorm_buffer.to_lex_cstring());
bzero(&ddl_log_state, sizeof(ddl_log_state));
if (lock_schema_name(thd, db.str))
if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(true);
path_length= build_table_filename(path, sizeof(path) - 1, db.str, "", "", 0);
@ -1071,7 +1080,7 @@ mysql_rm_db_internal(THD *thd, const Lex_ident_db &db, bool if_exists,
}
}
if (find_db_tables_and_rm_known_files(thd, dirp, db.str, path, &tables))
if (find_db_tables_and_rm_known_files(thd, dirp, dbnorm, path, &tables))
goto exit;
/*
@ -1089,7 +1098,7 @@ mysql_rm_db_internal(THD *thd, const Lex_ident_db &db, bool if_exists,
/* Lock all tables and stored routines about to be dropped. */
if (lock_table_names(thd, tables, NULL, thd->variables.lock_wait_timeout,
0) ||
lock_db_routines(thd, db))
lock_db_routines(thd, dbnorm))
goto exit;
if (!rm_mysql_schema)
@ -1115,15 +1124,15 @@ mysql_rm_db_internal(THD *thd, const Lex_ident_db &db, bool if_exists,
thd->push_internal_handler(&err_handler);
if (!thd->killed &&
!(tables &&
mysql_rm_table_no_locks(thd, tables, &db, &ddl_log_state, true, false,
mysql_rm_table_no_locks(thd, tables, &dbnorm, &ddl_log_state, true, false,
true, false, true, false)))
{
debug_crash_here("ddl_log_drop_after_drop_tables");
LEX_CSTRING cpath{ path, path_length};
ddl_log_drop_db(&ddl_log_state, &db, &cpath);
ddl_log_drop_db(&ddl_log_state, &dbnorm, &cpath);
drop_database_objects(thd, &cpath, &db, rm_mysql_schema);
drop_database_objects(thd, &cpath, &dbnorm, rm_mysql_schema);
/*
Now remove the db.opt file.
@ -1303,12 +1312,11 @@ bool mysql_rm_db(THD *thd, const Lex_ident_db &db, bool if_exists)
static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp,
const char *dbname,
const Lex_ident_db_normalized &db,
const char *path,
TABLE_LIST **tables)
{
char filePath[FN_REFLEN];
LEX_CSTRING db= { dbname, strlen(dbname) };
TABLE_LIST *tot_list=0, **tot_list_next_local, **tot_list_next_global;
DBUG_ENTER("find_db_tables_and_rm_known_files");
DBUG_PRINT("enter",("path: %s", path));
@ -1732,7 +1740,7 @@ uint mysql_change_db(THD *thd, const LEX_CSTRING *new_db_name,
goto done;
}
new_db_file_name= lower_case_table_names ?
new_db_file_name= lower_case_table_names == 1 ?
new_db_buff.copy_casedn(&my_charset_utf8mb3_general_ci,
*new_db_name).to_lex_cstring() :
*new_db_name;
@ -1917,8 +1925,11 @@ bool mysql_upgrade_db(THD *thd, const Lex_ident_db &old_db)
new_db= Lex_ident_db(old_db.str + MYSQL50_TABLE_NAME_PREFIX_LENGTH,
old_db.length - MYSQL50_TABLE_NAME_PREFIX_LENGTH);
const DBNameBuffer dbnorm_buffer_old(old_db, lower_case_table_names);
Lex_ident_db_normalized old_dbnorm(dbnorm_buffer_old.to_lex_cstring());
/* Lock the old name, the new name will be locked by mysql_create_db().*/
if (lock_schema_name(thd, old_db.str))
if (lock_schema_name(thd, old_dbnorm))
DBUG_RETURN(1);
/*