Commit 2599491a authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/ram/work/4.1.b9613
parents 8a1a4996 8a06f4ec

mysql-test/r/variables.result

+3 −0
Original line number Diff line number Diff line
@@ -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

#

mysql-test/t/variables.test

+7 −0
Original line number Diff line number Diff line
@@ -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;

sql/set_var.cc

+10 −0
Original line number Diff line number Diff line
@@ -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