← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-12-21 16:39:40 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20101221163940-c1pfo1jjvx7909xq
Tags: 2010.12.06-0ubuntu1
* New upstream release.
* Added libaio-dev build depend for InnoDB.
* Removed libpcre patch - applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0srv.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved.
4
 
Copyright (c) 2008, 2009 Google Inc.
5
 
Copyright (c) 2009, Percona Inc.
 
3
Copyright (C) 1995, 2010, Innobase Oy. All Rights Reserved.
 
4
Copyright (C) 2008, 2009 Google Inc.
 
5
Copyright (C) 2009, Percona Inc.
6
6
 
7
7
Portions of this file contain modifications contributed and copyrighted by
8
8
Google, Inc. Those modifications are gratefully acknowledged and are described
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;
466
467
 
467
468
/*
468
469
  Set the following to 0 if you want InnoDB to write messages on
1619
1620
                row_mysql_unfreeze_data_dictionary(trx);
1620
1621
                break;
1621
1622
        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. */
1622
1635
                /* Release fast index creation latch */
1623
1636
                row_mysql_unlock_data_dictionary(trx);
1624
1637
                break;
1638
1651
                row_mysql_freeze_data_dictionary(trx);
1639
1652
                break;
1640
1653
        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. */
1641
1657
                row_mysql_lock_data_dictionary(trx);
1642
1658
                break;
1643
1659
        }
2042
2058
        export_vars.innodb_rows_inserted = srv_n_rows_inserted;
2043
2059
        export_vars.innodb_rows_updated = srv_n_rows_updated;
2044
2060
        export_vars.innodb_rows_deleted = srv_n_rows_deleted;
 
2061
        export_vars.innodb_truncated_status_writes = srv_truncated_status_writes;
2045
2062
 
2046
2063
        mutex_exit(&srv_innodb_monitor_mutex);
2047
2064
}
2647
2664
        when there is database activity */
2648
2665
 
2649
2666
        srv_last_log_flush_time = time(NULL);
2650
 
        next_itr_time = ut_time_ms();
 
2667
 
 
2668
        /* Sleep for 1 second on entrying the for loop below the first time. */
 
2669
        next_itr_time = ut_time_ms() + 1000;
2651
2670
 
2652
2671
        for (i = 0; i < 10; i++) {
2653
2672
                ulint   cur_time = ut_time_ms();