← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2010-02-18 02:09:52 UTC
  • mto: (1273.16.6 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1304.
  • Revision ID: brian@gaz-20100218020952-g6us6ji7dqmu325n
Remove dead SHOW_ARRAY type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1739
1739
        char            *default_path;
1740
1740
        uint            format_id;
1741
1741
 
 
1742
        (void)innodb_status_variables;
1742
1743
        innodb_engine_ptr= new InnobaseEngine(innobase_engine_name);
1743
1744
 
1744
1745
 
7346
7347
}
7347
7348
 
7348
7349
/************************************************************************//**
7349
 
Here we export InnoDB status variables to MySQL. */
7350
 
static
7351
 
void
7352
 
innodb_export_status(void)
7353
 
/*======================*/
7354
 
{
7355
 
        if (innodb_inited) {
7356
 
                srv_export_innodb_status();
7357
 
        }
7358
 
}
7359
 
 
7360
 
/************************************************************************//**
7361
7350
Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB
7362
7351
Monitor to the client. */
7363
7352
static
8727
8716
        *(const char**) var_ptr = innobase_change_buffering_values[ibuf_use];
8728
8717
}
8729
8718
 
8730
 
static int show_innodb_vars(drizzle_show_var *var, char *)
8731
 
{
8732
 
  innodb_export_status();
8733
 
  var->type= SHOW_ARRAY;
8734
 
  var->value= (char *) &innodb_status_variables;
8735
 
  return 0;
8736
 
}
8737
 
 
8738
 
static st_show_var_func_container
8739
 
show_innodb_vars_cont = { &show_innodb_vars };
8740
 
 
8741
 
static drizzle_show_var innodb_status_variables_export[]= {
8742
 
  {"Innodb",                   (char*) &show_innodb_vars_cont, SHOW_FUNC},
8743
 
  {NULL, NULL, SHOW_LONG}
8744
 
};
8745
 
 
8746
 
 
8747
8719
/* plugin options */
8748
8720
static DRIZZLE_SYSVAR_BOOL(checksums, innobase_use_checksums,
8749
8721
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
9066
9038
  PLUGIN_LICENSE_GPL,
9067
9039
  innobase_init, /* Plugin Init */
9068
9040
  innobase_deinit, /* Plugin Deinit */
9069
 
  innodb_status_variables_export,/* status variables             */
 
9041
  NULL,/* status variables             */
9070
9042
  innobase_system_variables, /* system variables */
9071
9043
  NULL /* reserved */
9072
9044
}