← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.1/precise

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/srv/srv0srv.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 15:31:05 UTC
  • mfrom: (1.1.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20100621153105-pbbz3t6nyrf9t2zq
Tags: upstream-5.1.48
Import upstream version 5.1.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innodb_plugin/srv/srv0srv.c
1609
1609
        innodb_lock_wait_timeout, because trx->mysql_thd == NULL. */
1610
1610
        lock_wait_timeout = thd_lock_wait_timeout(trx->mysql_thd);
1611
1611
 
1612
 
        if (trx_is_interrupted(trx)
1613
 
            || (lock_wait_timeout < 100000000
1614
 
                && wait_time > (double) lock_wait_timeout)) {
 
1612
        if (lock_wait_timeout < 100000000
 
1613
            && wait_time > (double) lock_wait_timeout) {
1615
1614
 
1616
1615
                trx->error_state = DB_LOCK_WAIT_TIMEOUT;
1617
1616
        }
 
1617
 
 
1618
        if (trx_is_interrupted(trx)) {
 
1619
 
 
1620
                trx->error_state = DB_INTERRUPTED;
 
1621
        }
1618
1622
}
1619
1623
 
1620
1624
/********************************************************************//**