bzr push into mysql-trunk-innodb branch (vasil.dimov:3359 to 3360)

[vasil.dimov]

 3360 Vasil Dimov	2010-12-03
      Remove redundant closing of lock_latest_err_file
      
      lock_latest_err_file is already closed by lock_sys_close() which is
      called in innobase_shutdown_for_mysql() before closing the file
      manually.
      
      With this change lock_latest_err_file can be made static in lock0lock.c
      because it is only used in this file.

    modified:
      storage/innobase/include/lock0lock.h
      storage/innobase/lock/lock0lock.c
      storage/innobase/srv/srv0start.c
 3359 Vasil Dimov	2010-12-03 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb (empty)
      
      This change is already in mysql-trunk-innodb

=== modified file 'storage/innobase/include/lock0lock.h'
--- a/storage/innobase/include/lock0lock.h	revid:vasil.dimov@stripped
+++ b/storage/innobase/include/lock0lock.h	revid:vasil.dimov@stripped
@@ -42,8 +42,6 @@ Created 5/7/1996 Heikki Tuuri
 #ifdef UNIV_DEBUG
 extern ibool	lock_print_waits;
 #endif /* UNIV_DEBUG */
-/* Buffer for storing information about the most recent deadlock error */
-extern FILE*	lock_latest_err_file;
 
 /*********************************************************************//**
 Gets the size of a lock struct.

=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/lock/lock0lock.c	revid:vasil.dimov@stripped
@@ -384,7 +384,7 @@ UNIV_INTERN lock_sys_t*	lock_sys	= NULL;
 /* We store info on the latest deadlock error to this buffer. InnoDB
 Monitor will then fetch it and print */
 UNIV_INTERN ibool	lock_deadlock_found = FALSE;
-UNIV_INTERN FILE*	lock_latest_err_file;
+static FILE*		lock_latest_err_file;
 
 /* Flags for recursive deadlock search */
 enum lock_victim_enum {

=== modified file 'storage/innobase/srv/srv0start.c'
--- a/storage/innobase/srv/srv0start.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/srv/srv0start.c	revid:vasil.dimov@stripped
@@ -2271,9 +2271,6 @@ innobase_shutdown_for_mysql(void)
 	if (dict_foreign_err_file) {
 		fclose(dict_foreign_err_file);
 	}
-	if (lock_latest_err_file) {
-		fclose(lock_latest_err_file);
-	}
 
 	if (srv_print_verbose_log) {
 		ut_print_timestamp(stderr);

No bundle (reason: useless for push emails).