← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merged in plugin-slot-reorg patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
50
50
#include <drizzled/field/varstring.h>
51
51
#include <drizzled/field/timestamp.h>
52
52
#include <drizzled/plugin/storage_engine.h>
53
 
#include <drizzled/info_schema.h>
 
53
#include <drizzled/plugin/info_schema.h>
54
54
 
55
55
/* Include necessary InnoDB headers */
56
56
extern "C" {
1888
1888
 
1889
1889
        registry.add(innodb_engine_ptr);
1890
1890
 
1891
 
        registry.add(innodb_trx_schema_table);
1892
 
        registry.add(innodb_locks_schema_table);
1893
 
        registry.add(innodb_lock_waits_schema_table);   
1894
 
        registry.add(innodb_cmp_schema_table);
1895
 
        registry.add(innodb_cmp_reset_schema_table);
1896
 
        registry.add(innodb_cmpmem_schema_table);
1897
 
        registry.add(innodb_cmpmem_reset_schema_table);
 
1891
        registry.info_schema.add(innodb_trx_schema_table);
 
1892
        registry.info_schema.add(innodb_locks_schema_table);
 
1893
        registry.info_schema.add(innodb_lock_waits_schema_table);       
 
1894
        registry.info_schema.add(innodb_cmp_schema_table);
 
1895
        registry.info_schema.add(innodb_cmp_reset_schema_table);
 
1896
        registry.info_schema.add(innodb_cmpmem_schema_table);
 
1897
        registry.info_schema.add(innodb_cmpmem_reset_schema_table);
1898
1898
 
1899
1899
        /* Get the current high water mark format. */
1900
1900
        innobase_file_format_check = (char*) trx_sys_file_format_max_get();