← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
275
275
                        of the last directory in the path is used as
276
276
                        the database name: for example, in 'mysql/data/test'
277
277
                        the database name is 'test' */
278
 
/***********************************************************************
279
 
Closes an InnoDB database. */
280
 
static
281
 
int
282
 
innobase_end(handlerton *hton, ha_panic_function type);
283
278
 
284
279
/*********************************************************************
285
280
Creates an InnoDB transaction struct for the thd if it does not yet have one.
1428
1423
        innobase_hton->close_cursor_read_view=innobase_close_cursor_view;
1429
1424
        innobase_hton->create=innobase_create_handler;
1430
1425
        innobase_hton->drop_database=innobase_drop_database;
1431
 
        innobase_hton->panic=innobase_end;
1432
1426
        innobase_hton->start_consistent_snapshot=innobase_start_trx_and_assign_read_view;
1433
1427
        innobase_hton->flush_logs=innobase_flush_logs;
1434
1428
        innobase_hton->show_status=innobase_show_status;
1679
1673
Closes an InnoDB database. */
1680
1674
static
1681
1675
int
1682
 
innobase_end(handlerton *hton __attribute__((unused)),
1683
 
             ha_panic_function type __attribute__((unused)))
 
1676
innobase_deinit(void *p __attribute__((unused)))
1684
1677
/*==============*/
1685
1678
                                /* out: TRUE if error */
1686
1679
{
8057
8050
  "Supports transactions, row-level locking, and foreign keys",
8058
8051
  PLUGIN_LICENSE_GPL,
8059
8052
  innobase_init, /* Plugin Init */
8060
 
  NULL, /* Plugin Deinit */
 
8053
  innobase_deinit, /* Plugin Deinit */
8061
8054
  innodb_status_variables_export,/* status variables             */
8062
8055
  innobase_system_variables, /* system variables */
8063
8056
  NULL /* reserved */