diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
| commit | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (patch) | |
| tree | 14698de1876a7bea69d52b7f7ddaedbf0877551f /sql/set_var.cc | |
| parent | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (diff) | |
| download | mariadb-git-4822696ecb7302efc543e0be109f1c2a8f1bdf4e.tar.gz | |
Pull 5.1 treatment of community features into 5.0.
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 909496df045..dcc7a5a15d1 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -564,7 +564,7 @@ static sys_var_thd_bit sys_unique_checks("unique_checks", 0, set_option_bit, OPTION_RELAXED_UNIQUE_CHECKS, 1); -#ifdef ENABLED_PROFILING +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) static sys_var_thd_bit sys_profiling("profiling", NULL, set_option_bit, ulonglong(OPTION_PROFILING)); static sys_var_thd_ulong sys_profiling_history_size("profiling_history_size", @@ -899,6 +899,8 @@ struct show_var_st init_vars[]= { {"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE}, {"have_blackhole_engine", (char*) &have_blackhole_db, SHOW_HAVE}, {"have_compress", (char*) &have_compress, SHOW_HAVE}, + {"have_community_features", (char*) &have_community_features, SHOW_HAVE}, + {"have_profiling", (char*) &have_profiling, SHOW_HAVE}, {"have_crypt", (char*) &have_crypt, SHOW_HAVE}, {"have_csv", (char*) &have_csv_db, SHOW_HAVE}, {"have_dynamic_loading", (char*) &have_dlopen, SHOW_HAVE}, |