~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Stewart Smith
  • Author(s): Sunny Bains
  • Date: 2010-12-06 06:43:44 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1986.
  • Revision ID: stewart@flamingspork.com-20101206064344-y20lw9zx6w1hzs5v
Merge Revision revid:sunny.bains@oracle.com-20100923223709-6p3eiyrznpc1axmq from MySQL InnoDB

Original revid:sunny.bains@oracle.com-20100923223709-6p3eiyrznpc1axmq

Original Authors: Sunny Bains <Sunny.Bains@Oracle.Com>
Original commit message:
This patch comes from Michael: See bug#56933.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2664
2664
        when there is database activity */
2665
2665
 
2666
2666
        srv_last_log_flush_time = time(NULL);
2667
 
        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;
2668
2670
 
2669
2671
        for (i = 0; i < 10; i++) {
2670
2672
                ulint   cur_time = ut_time_ms();