diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:05:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:05:13 +0300 |
| commit | dba7e1e8e14254c9de61e74b7e68cdbbad0038a8 (patch) | |
| tree | 466788daf4b9cdb9125c6fe96789e2abb0746157 /sql/sql_show.cc | |
| parent | 838a1046b247e0c70089d3b5cf609c0a40fa3e4b (diff) | |
| parent | c43a666662ac71e70bde83e6673ebcb2811887af (diff) | |
| download | mariadb-git-dba7e1e8e14254c9de61e74b7e68cdbbad0038a8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 205b9facc7f..18b7e92bca5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -5088,16 +5088,16 @@ bool store_schema_shemata(THD* thd, TABLE *table, LEX_STRING *db_name, */ static bool verify_database_directory_exists(const LEX_STRING &dbname) { - DBUG_ENTER("verity_database_exists"); + DBUG_ENTER("verify_database_directory_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. + DBUG_RETURN(true); // Empty database name: does not exist. 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(true); // The database directory was not found: does not exist. DBUG_RETURN(false); // The database directory was found. } |