bk commit into 5.0 tree (jimw:1.1918)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1918 05/08/30 10:42:51 jimw@stripped +5 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  mysql-test/t/variables.test
    1.47 05/08/30 10:42:47 jimw@stripped +2 -2
    Resolve conflicts

  mysql-test/r/variables.result
    1.71 05/08/30 10:42:47 jimw@stripped +0 -0
    Resolve conflicts

  sql/set_var.cc
    1.135 05/08/30 10:41:01 jimw@stripped +2 -2
    Auto merged

  sql/mysqld.cc
    1.489 05/08/30 10:41:01 jimw@stripped +0 -0
    Auto merged

  sql/ha_blackhole.cc
    1.18 05/08/30 10:41:00 jimw@stripped +0 -2
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.70/mysql-test/r/variables.result	2005-08-01 17:50:32 -07:00
+++ 1.71/mysql-test/r/variables.result	2005-08-30 10:42:47 -07:00
@@ -513,6 +513,9 @@
 Variable_name	Value
 table_cache	1
 SET GLOBAL table_cache=DEFAULT;
+select @@have_innodb;
+@@have_innodb
+#
 create table t1 (a int);
 select a into @x from t1;
 Warnings:

--- 1.46/mysql-test/t/variables.test	2005-07-31 02:55:58 -07:00
+++ 1.47/mysql-test/t/variables.test	2005-08-30 10:42:47 -07:00
@@ -390,6 +390,13 @@
 SHOW VARIABLES LIKE 'table_cache';
 SET GLOBAL table_cache=DEFAULT;
 
+#
+# Bug #9613: @@have_innodb
+#
+
+--replace_column 1 #
+select @@have_innodb;
+
 # End of 4.1 tests
 
 #

--- 1.134/sql/set_var.cc	2005-08-30 09:51:01 -07:00
+++ 1.135/sql/set_var.cc	2005-08-30 10:41:01 -07:00
@@ -120,6 +120,7 @@
 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 @@
 /* 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_ft_boolean_syntax,
   &sys_foreign_key_checks,
   &sys_group_concat_max_len,
+  &sys_have_innodb,
   &sys_identity,
   &sys_init_connect,
   &sys_init_slave,
@@ -2773,6 +2777,12 @@
   thd->sys_var_tmp.long_value= 
     thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR];
   return (byte*) &thd->sys_var_tmp.long_value;
+}
+
+
+static byte *get_have_innodb(THD *thd)
+{
+  return (byte*) show_comp_option_name[have_innodb];
 }