List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:July 1 2011 7:10am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3250 to 3251)
View as plain text  
 3251 Tor Didriksen	2011-07-01
      Fix broken debug build:
      /export/home/pb2/build/sb_0-3560531-1309494801.95/mysql-5.6.3-m5/storage/innobase/lock/lock0lock.c: In function 'lock_deadlock_check_and_resolve':
      /export/home/pb2/build/sb_0-3560531-1309494801.95/mysql-5.6.3-m5/storage/innobase/lock/lock0lock.c:3955: error: invalid type argument of '->'
      gmake[2]: *** [storage/innobase/CMakeFiles/innobase.dir/lock/lock0lock.c.o] Error 1 gmake[2]: *** Waiting for unfinished jobs

    modified:
      storage/innobase/lock/lock0lock.c
 3250 Sunny Bains	2011-07-01
      Move the debug assertion to the caller of lock_deadlock_trx_rollback(). In
      non-debug code the debug parameter was unused and that caused a warning.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	2011-07-01 04:12:20 +0000
+++ b/storage/innobase/lock/lock0lock.c	2011-07-01 07:08:41 +0000
@@ -3952,7 +3952,7 @@ lock_deadlock_check_and_resolve(
 
 		} else if (victim_trx_id != 0 && victim_trx_id != trx->id) {
 
-			ut_ad(victim_trx_id == ctx->wait_lock->trx->id);
+			ut_ad(victim_trx_id == ctx.wait_lock->trx->id);
 			lock_deadlock_trx_rollback(&ctx);
 
 			lock_deadlock_found = TRUE;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3250 to 3251) Tor Didriksen4 Jul