bzr commit into mysql-trunk-innodb branch (marko.makela:3263) Bug#57232

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:sunny.bains@stripped19jxee2kdkp

 3263 Marko Mäkelä	2010-10-20
      Fix two errors introduced in the Bug#57232 fix by Sunny Bains
      revno: 3262
      revision-id: sunny.bains@strippedm-20101020085444-drizi19jxee2kdkp

    modified:
      storage/innobase/lock/lock0lock.c
      storage/innobase/row/row0mysql.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:sunny.bains@stripped
+++ b/storage/innobase/lock/lock0lock.c	revid:[e-mail]-20101020103435-stzwo66g76u1zqfz
@@ -5822,6 +5822,6 @@ lock_table_has_locks(
 		}
 	}
 
-	return(lock);
+	return(NULL);
 }
 #endif /* UNIV_DEBUG */

=== modified file 'storage/innobase/row/row0mysql.c'
--- a/storage/innobase/row/row0mysql.c	revid:sunny.bains@stripped020085444-drizi19jxee2kdkp
+++ b/storage/innobase/row/row0mysql.c	revid:marko.makela@strippedwo66g76u1zqfz
@@ -2590,6 +2590,7 @@ row_import_tablespace_for_mysql(
 		err = DB_ERROR;
 
 		row_mysql_lock_data_dictionary(trx);
+		table = NULL;
 
 		goto funct_exit;
 	}

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