database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 12:59:00 +01:00
parent a44869d842 c4143f9095
commit 6cfd2ba397
396 changed files with 10324 additions and 5797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_db.cc
View File

@ -763,7 +763,10 @@ mysql_alter_db_internal(THD *thd, const LEX_CSTRING *db,
int error= 0;
DBUG_ENTER("mysql_alter_db");
if (lock_schema_name(thd, db->str))
char dbnorm_buffer[SAFE_NAME_LEN + 1];
const char *dbnorm= normalize_db_name(db->str, dbnorm_buffer,
sizeof(dbnorm_buffer));
if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(TRUE);
/*
@ -1734,8 +1737,12 @@ bool mysql_upgrade_db(THD *thd, const LEX_CSTRING *old_db)
new_db.str= old_db->str + MYSQL50_TABLE_NAME_PREFIX_LENGTH;
new_db.length= old_db->length - MYSQL50_TABLE_NAME_PREFIX_LENGTH;
char dbnorm_buffer_old[SAFE_NAME_LEN + 1];
const char *old_dbnorm= normalize_db_name(old_db->str, dbnorm_buffer_old,
sizeof(dbnorm_buffer_old));
/* 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);
/*