database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-01 11:32:21 +03:00
parent fbfb5b5f68 1ea266f3ef
commit ea2bc974dc
129 changed files with 1426 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/sql_show.cc
View File

@ -5079,6 +5079,29 @@ bool store_schema_shemata(THD* thd, TABLE *table, LEX_STRING *db_name,
}
/*
Check if the specified database exists on disk.
@param dbname - the database name
@retval true - on error, the database directory does not exists
@retval false - on success, the database directory exists
*/
static bool verify_database_directory_exists(const LEX_STRING &dbname)
{
DBUG_ENTER("verity_database_exists");
char path[FN_REFLEN + 16];
uint path_len;
MY_STAT stat_info;
if (!dbname.str[0])
DBUG_RETURN(true); // Empty database name: does not exits.
path_len= build_table_filename(path, sizeof(path) - 1, dbname.str, "", "", 0);
path[path_len - 1]= 0;
if (!mysql_file_stat(key_file_misc, path, &stat_info, MYF(0)))
DBUG_RETURN(true); // The database directory was not found: does not exists.
DBUG_RETURN(false); // The database directory was found.
}
int fill_schema_schemata(THD *thd, TABLE_LIST *tables, COND *cond)
{
/*
@ -5107,19 +5130,10 @@ int fill_schema_schemata(THD *thd, TABLE_LIST *tables, COND *cond)
If we have lookup db value we should check that the database exists
*/
if(lookup_field_vals.db_value.str && !lookup_field_vals.wild_db_value &&
db_names.at(0) != &INFORMATION_SCHEMA_NAME)
{
char path[FN_REFLEN+16];
uint path_len;
MY_STAT stat_info;
if (!lookup_field_vals.db_value.str[0])
DBUG_RETURN(0);
path_len= build_table_filename(path, sizeof(path) - 1,
lookup_field_vals.db_value.str, "", "", 0);
path[path_len-1]= 0;
if (!mysql_file_stat(key_file_misc, path, &stat_info, MYF(0)))
DBUG_RETURN(0);
}
(!db_names.elements() /* The database name was too long */||
(db_names.at(0) != &INFORMATION_SCHEMA_NAME &&
verify_database_directory_exists(lookup_field_vals.db_value))))
DBUG_RETURN(0);
for (size_t i=0; i < db_names.elements(); i++)
{