diff options
| author | unknown <ramil@mysql.com> | 2005-08-31 10:25:00 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-08-31 10:25:00 +0500 |
| commit | f0535166243ba0a572c11ca10e8f530a9f07cdb5 (patch) | |
| tree | 362fedc1c7bc244cd193620869e0a203d37434e8 /sql | |
| parent | 588054be62558b26f4f02369e2d497cbec0da48d (diff) | |
| parent | 26b9da7ee346869142004758b53d21ae2c7ca02d (diff) | |
| download | mariadb-git-f0535166243ba0a572c11ca10e8f530a9f07cdb5.tar.gz | |
Merge mysql.com:/usr/home/ram/work/4.1.b9613
into mysql.com:/usr/home/ram/work/mysql-5.0
sql/ha_blackhole.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
merging
mysql-test/t/variables.test:
merging
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 b22ffe69095..26912becc81 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -120,6 +120,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 @@ -537,6 +538,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)); @@ -587,6 +590,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, @@ -2776,6 +2780,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 |