← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0srv.c

  • Committer: Andrew Hutchings
  • Date: 2010-12-06 19:36:53 UTC
  • mfrom: (1976 staging)
  • mto: This revision was merged to the branch mainline in revision 1991.
  • Revision ID: andrew@linuxjedi.co.uk-20101206193653-l85vryv18jb0yxx8
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0srv.c
463
463
UNIV_INTERN ib_int64_t  srv_n_lock_wait_time            = 0;
464
464
UNIV_INTERN ulint               srv_n_lock_max_wait_time        = 0;
465
465
 
466
 
UNIV_INTERN ulint               srv_truncated_status_writes     = 0;
467
466
 
468
467
/*
469
468
  Set the following to 0 if you want InnoDB to write messages on
1620
1619
                row_mysql_unfreeze_data_dictionary(trx);
1621
1620
                break;
1622
1621
        case RW_X_LATCH:
1623
 
                /* There should never be a lock wait when the
1624
 
                dictionary latch is reserved in X mode.  Dictionary
1625
 
                transactions should only acquire locks on dictionary
1626
 
                tables, not other tables. All access to dictionary
1627
 
                tables should be covered by dictionary
1628
 
                transactions. */
1629
 
                ut_print_timestamp(stderr);
1630
 
                fputs("  InnoDB: Error: dict X latch held in "
1631
 
                      "srv_suspend_mysql_thread\n", stderr);
1632
 
                /* This should never occur. This incorrect handling
1633
 
                was added in the early development of
1634
 
                ha_innobase::add_index() in InnoDB Plugin 1.0. */
1635
1622
                /* Release fast index creation latch */
1636
1623
                row_mysql_unlock_data_dictionary(trx);
1637
1624
                break;
1651
1638
                row_mysql_freeze_data_dictionary(trx);
1652
1639
                break;
1653
1640
        case RW_X_LATCH:
1654
 
                /* This should never occur. This incorrect handling
1655
 
                was added in the early development of
1656
 
                ha_innobase::add_index() in InnoDB Plugin 1.0. */
1657
1641
                row_mysql_lock_data_dictionary(trx);
1658
1642
                break;
1659
1643
        }
2058
2042
        export_vars.innodb_rows_inserted = srv_n_rows_inserted;
2059
2043
        export_vars.innodb_rows_updated = srv_n_rows_updated;
2060
2044
        export_vars.innodb_rows_deleted = srv_n_rows_deleted;
2061
 
        export_vars.innodb_truncated_status_writes = srv_truncated_status_writes;
2062
2045
 
2063
2046
        mutex_exit(&srv_innodb_monitor_mutex);
2064
2047
}
2664
2647
        when there is database activity */
2665
2648
 
2666
2649
        srv_last_log_flush_time = time(NULL);
2667
 
 
2668
 
        /* Sleep for 1 second on entrying the for loop below the first time. */
2669
 
        next_itr_time = ut_time_ms() + 1000;
 
2650
        next_itr_time = ut_time_ms();
2670
2651
 
2671
2652
        for (i = 0; i < 10; i++) {
2672
2653
                ulint   cur_time = ut_time_ms();