bk commit into 5.1 tree (cmiller:1.2309)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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@stripped, 2006-09-05 10:01:52-04:00, cmiller@stripped +1 -0
  Removed duplicate code from bad merge.

  sql/ha_innodb.cc@stripped, 2006-09-05 10:01:02-04:00, cmiller@stripped +0 -13
    Removed duplicate code from bad merge.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.291/sql/ha_innodb.cc	2006-09-05 10:01:56 -04:00
+++ 1.292/sql/ha_innodb.cc	2006-09-05 10:01:56 -04:00
@@ -7631,19 +7631,6 @@
   {NullS, NullS, SHOW_LONG}
 };
 
-static int show_innodb_vars(THD *thd, SHOW_VAR *var, char *buff)
-{
-  innodb_export_status();
-  var->type= SHOW_ARRAY;
-  var->value= (char *) &innodb_status_variables;
-  return 0;
-}
-
-SHOW_VAR innodb_status_variables_export[]= {
-  {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
-  {NullS, NullS, SHOW_LONG}
-};
-
 struct st_mysql_storage_engine innobase_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION, &innobase_hton};