diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
| commit | 4e633ec2342754594fad8937a2d12615e5e5cb96 (patch) | |
| tree | 88543c956886365a2376e01ce26a0436c38a4454 /sql/mysqld.h | |
| parent | 87dfc8ef1ddf9cfebf535fbfce70152ce3ee6c23 (diff) | |
| parent | f54464035a4bfae7c7297e7fe1a8ba7e76ea6585 (diff) | |
| download | mariadb-git-4e633ec2342754594fad8937a2d12615e5e5cb96.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 842d74d063a..e14cd15ceb8 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -71,6 +71,7 @@ void unlink_thd(THD *thd); bool one_thread_per_connection_end(THD *thd, bool put_in_cache); void flush_thread_cache(); void refresh_status(THD *thd); +bool is_secure_file_path(char *path); extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *files_charset_info ; @@ -97,6 +98,7 @@ extern ulonglong log_output_options; extern ulong log_backup_output_options; extern my_bool opt_log_queries_not_using_indexes; extern bool opt_disable_networking, opt_skip_show_db; +extern bool opt_skip_name_resolve; extern bool opt_ignore_builtin_innodb; extern my_bool opt_character_set_client_handshake; extern bool volatile abort_loop; |