diff options
| author | unknown <ramil@mysql.com> | 2005-08-30 12:33:58 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-08-30 12:33:58 +0500 |
| commit | dcbbffa525417725409a335998a527c3b3e8bd4b (patch) | |
| tree | b5b2919cd4716deb87a937297e8613c71daf33e9 /sql/set_var.cc | |
| parent | 40cfe1e9cd677a8ff819ae0408d90771bd9982be (diff) | |
| parent | a8dbdbe9278d9bc128e3e8357d951301ec676132 (diff) | |
| download | mariadb-git-dcbbffa525417725409a335998a527c3b3e8bd4b.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9613
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -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 |