diff options
| author | ramil@mysql.com <> | 2005-08-30 17:32:53 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-08-30 17:32:53 +0500 |
| commit | dba11de02a31755e707307bd11bd0f298b143b8f (patch) | |
| tree | 3b6db3de05e12d704fde784742177f47d26a5f41 /sql | |
| parent | 941f458e56d92d54ce4ba80b5c56ad26bffb3822 (diff) | |
| parent | d9658e9e3c0c83eb8d61fcb7d255a0b7149b45df (diff) | |
| download | mariadb-git-dba11de02a31755e707307bd11bd0f298b143b8f.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9613
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 10 |
1 files changed, 10 insertions, 0 deletions
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 |