mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
8c2bb705f1
The feature was backported from MySQL 5.6.
Some code was added to make commands as
SELECT * FROM ignored_db.t1;
CALL ignored_db.proc();
USE ignored_db;
to take that option into account.
per-file comments:
mysql-test/r/ignore_db_dirs_basic.result
test result added.
mysql-test/t/ignore_db_dirs_basic-master.opt
options for the test,
actually the set of --ignore-db-dir lines.
mysql-test/t/ignore_db_dirs_basic.test
test for the feature.
Same test from 5.6 was taken as a basis,
then tests for SELECT, CALL etc were added.
per-file comments:
sql/mysql_priv.h
MDEV-495 backport --ignore-db-dir.
interface for db_name_is_in_ignore_list() added.
sql/mysqld.cc
MDEV-495 backport --ignore-db-dir.
--ignore-db-dir handling.
sql/set_var.cc
MDEV-495 backport --ignore-db-dir.
the @@ignore_db_dirs variable added.
sql/sql_show.cc
MDEV-495 backport --ignore-db-dir.
check if the directory is ignored.
sql/sql_show.h
MDEV-495 backport --ignore-db-dir.
interface added for opt_ignored_db_dirs.
sql/table.cc
MDEV-495 backport --ignore-db-dir.
check if the directory is ignored.
53 lines
1.7 KiB
C++
53 lines
1.7 KiB
C++
/*
|
|
Copyright (c) 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
|
Use is subject to license terms.
|
|
|
|
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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef SQL_SHOW_H
|
|
#define SQL_SHOW_H
|
|
|
|
/* Forward declarations */
|
|
class String;
|
|
class THD;
|
|
struct st_ha_create_information;
|
|
typedef st_ha_create_information HA_CREATE_INFO;
|
|
struct TABLE_LIST;
|
|
|
|
enum find_files_result {
|
|
FIND_FILES_OK,
|
|
FIND_FILES_OOM,
|
|
FIND_FILES_DIR
|
|
};
|
|
|
|
find_files_result find_files(THD *thd, List<LEX_STRING> *files, const char *db,
|
|
const char *path, const char *wild, bool dir);
|
|
|
|
int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
|
|
HA_CREATE_INFO *create_info_arg, bool show_database);
|
|
int view_store_create_info(THD *thd, TABLE_LIST *table, String *buff);
|
|
|
|
int copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table);
|
|
|
|
|
|
/* Handle the ignored database directories list for SHOW/I_S. */
|
|
bool ignore_db_dirs_init();
|
|
void ignore_db_dirs_free();
|
|
void ignore_db_dirs_reset();
|
|
bool ignore_db_dirs_process_additions();
|
|
bool push_ignored_db_dir(char *path);
|
|
extern char *opt_ignore_db_dirs;
|
|
|
|
#endif /* SQL_SHOW_H */
|