diff options
| author | msvensson@pilot.mysql.com <> | 2007-02-14 14:51:49 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2007-02-14 14:51:49 +0100 |
| commit | b6f78aa1533c74603a814975718622a35f5cdc74 (patch) | |
| tree | 8f6f0bf8705654adfef1b27bf5997db33482b106 /sql/set_var.cc | |
| parent | e03946d1e44b116969eea5602be26a5c354058a7 (diff) | |
| parent | 24a242bee152626b3cfd0e064f601c98aab4d009 (diff) | |
| download | mariadb-git-b6f78aa1533c74603a814975718622a35f5cdc74.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 55fbeac5622..8a31cdf32ce 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -411,6 +411,8 @@ sys_query_cache_wlock_invalidate("query_cache_wlock_invalidate", &SV::query_cache_wlock_invalidate); #endif /* HAVE_QUERY_CACHE */ sys_var_bool_ptr sys_secure_auth("secure_auth", &opt_secure_auth); +sys_var_const_str_ptr sys_secure_file_priv("secure_file_priv", + &opt_secure_file_priv); sys_var_long_ptr sys_server_id("server_id", &server_id, fix_server_id); sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol", &opt_slave_compressed_protocol); @@ -669,7 +671,6 @@ sys_var_have_variable sys_have_rtree_keys("have_rtree_keys", &have_rtree_keys); sys_var_have_variable sys_have_symlink("have_symlink", &have_symlink); /* Global read-only variable describing server license */ sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE)); - /* Global variables which enable|disable logging */ sys_var_log_state sys_var_general_log("general_log", &opt_log, QUERY_LOG_GENERAL); @@ -959,6 +960,7 @@ SHOW_VAR init_vars[]= { #endif {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank, SHOW_SYS}, {"secure_auth", (char*) &sys_secure_auth, SHOW_SYS}, + {"secure_file_priv", (char*) &sys_secure_file_priv, SHOW_SYS}, #ifdef HAVE_SMEM {"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL}, {"shared_memory_base_name", (char*) &shared_memory_base_name, SHOW_CHAR_PTR}, |