diff options
| -rw-r--r-- | mysql-test/r/variables.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 7 | ||||
| -rw-r--r-- | sql/set_var.cc | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 14260cd04f9..efcc3d21144 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -491,3 +491,6 @@ SHOW VARIABLES LIKE 'table_cache'; Variable_name Value table_cache 1 SET GLOBAL table_cache=DEFAULT; +select @@have_innodb; +@@have_innodb +# diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 7743b70d0cd..f888541f17a 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -381,3 +381,10 @@ SHOW VARIABLES LIKE 'table_cache'; SET GLOBAL table_cache=DEFAULT; # End of 4.1 tests + +# +# Bug #9613: @@have_innodb +# + +--replace_column 1 # +select @@have_innodb; diff --git a/sql/set_var.cc b/sql/set_var.cc index 99985c3647c..c0186880a59 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -118,6 +118,7 @@ static KEY_CACHE *create_key_cache(const char *name, uint length); void fix_sql_mode_var(THD *thd, enum_var_type type); static byte *get_error_count(THD *thd); static byte *get_warning_count(THD *thd); +static byte *get_have_innodb(THD *thd); /* Variable definition list @@ -484,6 +485,8 @@ sys_var_thd_time_zone sys_time_zone("time_zone"); /* Read only variables */ sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE); +sys_var_readonly sys_have_innodb("have_innodb", OPT_GLOBAL, + SHOW_CHAR, get_have_innodb); /* Global read-only variable describing server license */ sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE)); @@ -529,6 +532,7 @@ sys_var *sys_variables[]= &sys_ft_boolean_syntax, &sys_foreign_key_checks, &sys_group_concat_max_len, + &sys_have_innodb, &sys_identity, &sys_init_connect, &sys_init_slave, @@ -2616,6 +2620,12 @@ static byte *get_error_count(THD *thd) } +static byte *get_have_innodb(THD *thd) +{ + return (byte*) show_comp_option_name[have_innodb]; +} + + /**************************************************************************** Main handling of variables: - Initialisation |