bzr push into mysql-trunk-innodb branch (Sunny.Bains:3587 to 3588)

[Sunny Bains]

 3588 Sunny Bains	2011-04-16
      The vector can have NULL entries, we should skip them. Bug introduced by the
      fix for bug 11833462.

    modified:
      storage/innobase/lock/lock0lock.c
 3587 Sunny Bains	2011-04-15
      Fix test that should have been fixed as part of Bug 12348462 fix.

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:sunny.bains@stripped
+++ b/storage/innobase/lock/lock0lock.c	revid:sunny.bains@stripped
@@ -4416,6 +4416,10 @@ lock_trx_table_locks_remove(
 
 		lock = ib_vector_get(trx->lock.table_locks, i);
 
+		if (lock == NULL) {
+			continue;
+		}
+
 		ut_a(trx == lock->trx);
 		ut_a(lock_get_type_low(lock) & LOCK_TABLE);
 		ut_a(lock->un_member.tab_lock.table != NULL);


Attachment: [text/bzr-bundle] bzr/[e-mail]