← 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-25 07:54:52 UTC
  • mfrom: (1273.13.101 build)
  • Revision ID: brian@gaz-20100225075452-19eozreshbrerypu
Merge of all patches in build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
81
81
#include "drizzled/field/varstring.h"
82
82
#include "drizzled/field/timestamp.h"
83
83
#include "drizzled/plugin/xa_storage_engine.h"
84
 
#include "drizzled/plugin/info_schema_table.h"
85
84
#include "drizzled/memory/multi_malloc.h"
86
85
#include "drizzled/pthread_globals.h"
87
86
#include "drizzled/named_savepoint.h"
2063
2062
        pthread_cond_init(&commit_cond, NULL);
2064
2063
        innodb_inited= 1;
2065
2064
 
 
2065
#if 0
2066
2066
        if (innodb_locks_init() ||
2067
2067
                innodb_trx_init() ||
2068
2068
                innodb_lock_waits_init() ||
2071
2071
                i_s_cmpmem_init() ||
2072
2072
                i_s_cmpmem_reset_init())
2073
2073
                goto error;
 
2074
#endif
2074
2075
 
2075
2076
        status_table_function_ptr= new InnodbStatusTool;
2076
2077
 
2078
2079
 
2079
2080
        registry.add(status_table_function_ptr);
2080
2081
 
 
2082
#if 0
2081
2083
        registry.add(innodb_trx_schema_table);
2082
2084
        registry.add(innodb_locks_schema_table);
2083
2085
        registry.add(innodb_lock_waits_schema_table);   
2085
2087
        registry.add(innodb_cmp_reset_schema_table);
2086
2088
        registry.add(innodb_cmpmem_schema_table);
2087
2089
        registry.add(innodb_cmpmem_reset_schema_table);
 
2090
#endif
2088
2091
 
2089
2092
        /* Get the current high water mark format. */
2090
2093
        innobase_file_format_check = (char*) trx_sys_file_format_max_get();
2102
2105
innobase_deinit(plugin::Registry &registry)
2103
2106
{
2104
2107
        int     err= 0;
 
2108
#if 0
2105
2109
        i_s_common_deinit(registry);
 
2110
#endif
2106
2111
 
2107
2112
        registry.remove(status_table_function_ptr);
2108
2113
        delete status_table_function_ptr;