← Back to branch summary

~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/handler/ha_innodb.cc

  • Committer: Laurynas Biveinis
  • Date: 2013-09-06 13:24:59 UTC
  • mfrom: (558.8.3 5.5)
  • Revision ID: laurynas.biveinis@percona.com-20130906132459-jfaquw8dbwluzbsl
Merge lp:~akopytov/percona-server/ahi-fixes-5.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
Percona-Server/storage/innobase/handler/ha_innodb.cc
1123
1123
 
1124
1124
        trx = thd_to_trx(thd);
1125
1125
 
1126
 
        if (trx != NULL) {
1127
 
                trx_search_latch_release_if_reserved(trx);
1128
 
        }
 
1126
        /* No-op in XtraDB */
 
1127
        trx_search_latch_release_if_reserved(trx);
1129
1128
 
1130
1129
        return(0);
1131
1130
}
3564
3563
        /* Since we will reserve the kernel mutex, we have to release
3565
3564
        the search system latch first to obey the latching order. */
3566
3565
 
3567
 
        if (trx->has_search_latch) {
3568
 
                trx_search_latch_release_if_reserved(trx);
3569
 
        }
 
3566
        /* No-op in XtraDB */
 
3567
        trx_search_latch_release_if_reserved(trx);
3570
3568
 
3571
3569
        if (!trx_is_registered_for_2pc(trx) && trx_is_started(trx)) {
3572
3570
                /* We cannot throw error here; instead we will catch this error
3612
3610
        /* Since we will reserve the kernel mutex, we have to release
3613
3611
        the search system latch first to obey the latching order. */
3614
3612
 
3615
 
        if (trx->has_search_latch) {
3616
 
                trx_search_latch_release_if_reserved(trx);
3617
 
        }
 
3613
        /* No-op in XtraDB */
 
3614
        trx_search_latch_release_if_reserved(trx);
3618
3615
 
3619
3616
        if (trx->fake_changes && (all || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) {
3620
3617
                innobase_rollback(hton, thd, all); /* rollback implicitly */
12820
12817
  "Disable with --skip-innodb-adaptive-hash-index.",
12821
12818
  NULL, innodb_adaptive_hash_index_update, TRUE);
12822
12819
 
 
12820
/* btr_search_index_num is constrained to machine word size for historical
 
12821
reasons. This limitation can be easily removed later. */
12823
12822
static MYSQL_SYSVAR_ULONG(adaptive_hash_index_partitions, btr_search_index_num,
12824
12823
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
12825
12824
  "Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)",