bzr push into mysql-trunk-innodb branch (marko.makela:3629 to 3630)

[marko.makela]

 3630 Marko Mäkelä	2011-05-17 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/fil/fil0fil.c
 3629 Marko Mäkelä	2011-05-17
      Bug#12561303 InnoDB file API uses two parameters for file size
      
      Define os_offset_t as ib_uint64_t. Previously, file offsets were
      defined as ib_int64_t or pairs of ulint.
      
      os_aio(), os_file_read(), os_file_write(), os_file_read_no_error_handling():
      Replace offset_low,offset_high with offset.
      
      os_file_get_size(): Return the file size or -1 on error. Check the
      return value in callers.
      
      os_file_get_size_as_iblonglong(): Remove; replaced by os_file_get_size().
      
      ut_get_high32(): Remove.
      
      rb:662 approved by Sunny Bains

    modified:
      storage/innobase/fil/fil0fil.c
      storage/innobase/include/os0file.h
      storage/innobase/include/os0file.ic
      storage/innobase/include/ut0ut.h
      storage/innobase/log/log0recv.c
      storage/innobase/os/os0file.c
      storage/innobase/row/row0merge.c
      storage/innobase/srv/srv0start.c
      storage/innobase/ut/ut0ut.c
=== modified file 'storage/innobase/fil/fil0fil.c'
--- a/storage/innobase/fil/fil0fil.c	revid:marko.makela@stripped
+++ b/storage/innobase/fil/fil0fil.c	revid:marko.makela@stripped0110517122501-2nic8zdeknx5qkc4
@@ -852,7 +852,8 @@ fil_node_close_file(
 	ut_a(node->n_pending == 0);
 	ut_a(node->n_pending_flushes == 0);
 	ut_a(!node->being_extended);
-	ut_a(node->modification_counter == node->flush_counter);
+	ut_a(node->modification_counter == node->flush_counter
+	     || srv_fast_shutdown == 2);
 
 	ret = os_file_close(node->handle);
 	ut_a(ret);

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