← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2009-03-24 18:05:25 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090324180525-ok5metxsa5yor53k
First step of hton rename.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
1825
1825
        char            *default_path;
1826
1826
        uint            format_id;
1827
1827
 
1828
 
        StorageEngine *innobase_hton= (StorageEngine *)p;
 
1828
        StorageEngine *innobase_engine= (StorageEngine *)p;
1829
1829
 
1830
1830
#ifdef DRIZZLE_DYNAMIC_PLUGIN
1831
1831
        if (!innodb_plugin_init()) {
1835
1835
 
1836
1836
        if (innodb_hton_ptr) {
1837
1837
                /* Patch the statically linked StorageEngine and variables */
1838
 
                innobase_hton = innodb_hton_ptr;
 
1838
                innobase_engine = innodb_hton_ptr;
1839
1839
        }
1840
1840
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
1841
1841
 
1842
 
        innodb_hton_ptr = innobase_hton;
 
1842
        innodb_hton_ptr = innobase_engine;
1843
1843
 
1844
 
        innobase_hton->state = SHOW_OPTION_YES;
1845
 
        innobase_hton->savepoint_offset=sizeof(trx_named_savept_t);
1846
 
        innobase_hton->close_connection=innobase_close_connection;
1847
 
        innobase_hton->savepoint_set=innobase_savepoint;
1848
 
        innobase_hton->savepoint_rollback=innobase_rollback_to_savepoint;
1849
 
        innobase_hton->savepoint_release=innobase_release_savepoint;
1850
 
        innobase_hton->commit=innobase_commit;
1851
 
        innobase_hton->rollback=innobase_rollback;
1852
 
        innobase_hton->prepare=innobase_xa_prepare;
1853
 
        innobase_hton->recover=innobase_xa_recover;
1854
 
        innobase_hton->commit_by_xid=innobase_commit_by_xid;
1855
 
        innobase_hton->rollback_by_xid=innobase_rollback_by_xid;
1856
 
        innobase_hton->create=innobase_create_handler;
1857
 
        innobase_hton->drop_database=innobase_drop_database;
1858
 
        innobase_hton->start_consistent_snapshot=innobase_start_trx_and_assign_read_view;
1859
 
        innobase_hton->flush_logs=innobase_flush_logs;
1860
 
        innobase_hton->show_status=innobase_show_status;
1861
 
        innobase_hton->flags=HTON_NO_FLAGS;
1862
 
        innobase_hton->release_temporary_latches=innobase_release_temporary_latches;
 
1844
        innobase_engine->state = SHOW_OPTION_YES;
 
1845
        innobase_engine->savepoint_offset=sizeof(trx_named_savept_t);
 
1846
        innobase_engine->close_connection=innobase_close_connection;
 
1847
        innobase_engine->savepoint_set=innobase_savepoint;
 
1848
        innobase_engine->savepoint_rollback=innobase_rollback_to_savepoint;
 
1849
        innobase_engine->savepoint_release=innobase_release_savepoint;
 
1850
        innobase_engine->commit=innobase_commit;
 
1851
        innobase_engine->rollback=innobase_rollback;
 
1852
        innobase_engine->prepare=innobase_xa_prepare;
 
1853
        innobase_engine->recover=innobase_xa_recover;
 
1854
        innobase_engine->commit_by_xid=innobase_commit_by_xid;
 
1855
        innobase_engine->rollback_by_xid=innobase_rollback_by_xid;
 
1856
        innobase_engine->create=innobase_create_handler;
 
1857
        innobase_engine->drop_database=innobase_drop_database;
 
1858
        innobase_engine->start_consistent_snapshot=innobase_start_trx_and_assign_read_view;
 
1859
        innobase_engine->flush_logs=innobase_flush_logs;
 
1860
        innobase_engine->show_status=innobase_show_status;
 
1861
        innobase_engine->flags=HTON_NO_FLAGS;
 
1862
        innobase_engine->release_temporary_latches=innobase_release_temporary_latches;
1863
1863
 
1864
1864
        ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)DRIZZLE_TYPE_VARCHAR);
1865
1865
 
2102
2102
        pthread_cond_init(&commit_cond, NULL);
2103
2103
        innodb_inited= 1;
2104
2104
#ifdef DRIZZLE_DYNAMIC_PLUGIN
2105
 
        if (innobase_hton != p) {
2106
 
                innobase_hton = reinterpret_cast<StorageEngine*>(p);
2107
 
                *innobase_hton = *innodb_hton_ptr;
 
2105
        if (innobase_engine != p) {
 
2106
                innobase_engine = reinterpret_cast<StorageEngine*>(p);
 
2107
                *innobase_engine = *innodb_hton_ptr;
2108
2108
        }
2109
2109
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
2110
2110