database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-12392 Duplicate code cleanup: add function normalize_db_name()

Browse Source
This commit is contained in:
Alexander Barkov
2017-03-29 17:22:49 +04:00
parent fb43180c4f
commit 2361f835ae
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sql/sql_db.cc
View File

@@ -583,15 +583,8 @@ mysql_create_db_internal(THD *thd, char *db,
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
char db_tmp[SAFE_NAME_LEN], *dbnorm; char db_tmp[SAFE_NAME_LEN];
if (lower_case_table_names) char *dbnorm= normalize_db_name(db, db_tmp, sizeof(db_tmp));
{
strmake_buf(db_tmp, db);
my_casedn_str(system_charset_info, db_tmp);
dbnorm= db_tmp;
}
else
dbnorm= db;
if (lock_schema_name(thd, dbnorm)) if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(-1); DBUG_RETURN(-1);
@@ -824,15 +817,8 @@ mysql_rm_db_internal(THD *thd,char *db, bool if_exists, bool silent)
Drop_table_error_handler err_handler; Drop_table_error_handler err_handler;
DBUG_ENTER("mysql_rm_db"); DBUG_ENTER("mysql_rm_db");
char db_tmp[SAFE_NAME_LEN], *dbnorm; char db_tmp[SAFE_NAME_LEN];
if (lower_case_table_names) char *dbnorm= normalize_db_name(db, db_tmp, sizeof(db_tmp));
{
strmake_buf(db_tmp, db);
my_casedn_str(system_charset_info, db_tmp);
dbnorm= db_tmp;
}
else
dbnorm= db;
if (lock_schema_name(thd, dbnorm)) if (lock_schema_name(thd, dbnorm))
DBUG_RETURN(true); DBUG_RETURN(true);
@@ -1891,3 +1877,14 @@ bool check_db_dir_existence(const char *db_name)
return my_access(db_dir_path, F_OK); return my_access(db_dir_path, F_OK);
} }
char *normalize_db_name(char *db, char *buffer, size_t buffer_size)
{
DBUG_ASSERT(buffer_size > 1);
if (!lower_case_table_names)
return db;
strmake(buffer, db, buffer_size - 1);
my_casedn_str(system_charset_info, buffer);
return buffer;
}

2
sql/sql_db.h
View File

@@ -45,6 +45,8 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name);
bool my_dbopt_init(void); bool my_dbopt_init(void);
void my_dbopt_cleanup(void); void my_dbopt_cleanup(void);
char *normalize_db_name(char *db, char *buffer, size_t buffer_size);
#define MY_DB_OPT_FILE "db.opt" #define MY_DB_OPT_FILE "db.opt"
#endif /* SQL_DB_INCLUDED */ #endif /* SQL_DB_INCLUDED */