← 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-25 08:39:58 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090325083958-5gp7pps4c9id7xol
More naming fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
1299
1299
/*************************************************************************
1300
1300
Construct ha_innobase handler. */
1301
1301
UNIV_INTERN
1302
 
ha_innobase::ha_innobase(StorageEngine *engine, TABLE_SHARE *table_arg)
1303
 
  :handler(engine, table_arg),
 
1302
ha_innobase::ha_innobase(StorageEngine *engine_arg, TABLE_SHARE *table_arg)
 
1303
  :handler(engine_arg, table_arg),
1304
1304
  int_table_flags(HA_REC_NOT_IN_SEQ |
1305
1305
                  HA_NULL_IN_KEY |
1306
1306
                  HA_CAN_INDEX_BLOBS |
1803
1803
 
1804
1804
        if (prebuilt->trx->active_trans == 0) {
1805
1805
 
1806
 
                innobase_register_trx_and_stmt(ht, user_session);
 
1806
                innobase_register_trx_and_stmt(engine, user_session);
1807
1807
 
1808
1808
                prebuilt->trx->active_trans = 1;
1809
1809
        }
2825
2825
        holding btr_search_latch. This breaks the latching order as
2826
2826
        we acquire dict_sys->mutex below and leads to a deadlock. */
2827
2827
        if (session != NULL) {
2828
 
                ht->release_temporary_latches(ht, session);
 
2828
                engine->release_temporary_latches(engine, session);
2829
2829
        }
2830
2830
 
2831
2831
        normalize_table_name(norm_name, name);
3041
3041
 
3042
3042
        session = ha_session();
3043
3043
        if (session != NULL) {
3044
 
                ht->release_temporary_latches(ht, session);
 
3044
                engine->release_temporary_latches(engine, session);
3045
3045
        }
3046
3046
 
3047
3047
        row_prebuilt_free(prebuilt, FALSE);
4053
4053
                        no need to re-acquire locks on it. */
4054
4054
 
4055
4055
                        /* Altering to InnoDB format */
4056
 
                        ht->commit(ht, user_session, 1);
 
4056
                        engine->commit(engine, user_session, 1);
4057
4057
                        /* Note that this transaction is still active. */
4058
4058
                        prebuilt->trx->active_trans = 1;
4059
4059
                        /* We will need an IX lock on the destination table. */
4069
4069
 
4070
4070
                        /* Commit the transaction.  This will release the table
4071
4071
                        locks, so they have to be acquired again. */
4072
 
                        ht->commit(ht, user_session, 1);
 
4072
                        engine->commit(engine, user_session, 1);
4073
4073
                        /* Note that this transaction is still active. */
4074
4074
                        prebuilt->trx->active_trans = 1;
4075
4075
                        /* Re-acquire the table lock on the source table. */
7465
7465
        /* Set the MySQL flag to mark that there is an active transaction */
7466
7466
        if (trx->active_trans == 0) {
7467
7467
 
7468
 
                innobase_register_trx_and_stmt(ht, session);
 
7468
                innobase_register_trx_and_stmt(engine, session);
7469
7469
                trx->active_trans = 1;
7470
7470
        } else {
7471
 
                innobase_register_stmt(ht, session);
 
7471
                innobase_register_stmt(engine, session);
7472
7472
        }
7473
7473
 
7474
7474
        return(0);
7537
7537
                transaction */
7538
7538
                if (trx->active_trans == 0) {
7539
7539
 
7540
 
                        innobase_register_trx_and_stmt(ht, session);
 
7540
                        innobase_register_trx_and_stmt(engine, session);
7541
7541
                        trx->active_trans = 1;
7542
7542
                } else if (trx->n_mysql_tables_in_use == 0) {
7543
 
                        innobase_register_stmt(ht, session);
 
7543
                        innobase_register_stmt(engine, session);
7544
7544
                }
7545
7545
 
7546
7546
                if (trx->isolation_level == TRX_ISO_SERIALIZABLE
7618
7618
 
7619
7619
                if (!session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) {
7620
7620
                        if (trx->active_trans != 0) {
7621
 
                                ht->commit(ht, session, TRUE);
 
7621
                                engine->commit(engine, session, TRUE);
7622
7622
                        }
7623
7623
                } else {
7624
7624
                        if (trx->isolation_level <= TRX_ISO_READ_COMMITTED
7698
7698
        /* Set the MySQL flag to mark that there is an active transaction */
7699
7699
        if (trx->active_trans == 0) {
7700
7700
 
7701
 
                innobase_register_trx_and_stmt(ht, session);
 
7701
                innobase_register_trx_and_stmt(engine, session);
7702
7702
                trx->active_trans = 1;
7703
7703
        }
7704
7704