• Vasil Dimov's avatar
    Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin: · 497ff20f
    Vasil Dimov authored
      ------------------------------------------------------------
      revno: 3094
      revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
      parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
      committer: Vasil Dimov <vasil.dimov@oracle.com>
      branch nick: mysql-trunk-innodb
      timestamp: Thu 2010-05-13 10:46:52 +0300
      message:
        Followup to Bug#51920, fix binlog.binlog_killed
        
        This is a followup to the fix of
        
        Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
        timeout
        
        in that fix (rb://279) the behavior was changed to honor when a trx is
        interrupted during lock wait, but the returned error code was still
        "lock wait timeout" when it should be "interrupted".
        
        This change fixes the non-deterministically failing test binlog.binlog_killed,
        that failed like this:
        
        binlog.binlog_killed 'stmt'              [ fail ]
                Test ended at 2010-05-12 11:39:08
        
        CURRENT_TEST: binlog.binlog_killed
        mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
        
        Approved by:	Sunny Bains (rb://344)
      ------------------------------------------------------------
    497ff20f
srv0srv.c 81.5 KB