bzr push into mysql-trunk-innodb branch (marko.makela:3630 to 3631) Bug#12561303

[marko.makela]

 3631 Marko Mäkelä	2011-05-18
      Fix a signed/unsigned comparison that was added in
      Bug#12561303 InnoDB file API uses two parameters for file size
      (bzr revision id marko.makela@stripped6r2tumzz)

    modified:
      storage/innobase/os/os0file.c
 3630 Marko Mäkelä	2011-05-17 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/fil/fil0fil.c
=== modified file 'storage/innobase/os/os0file.c'
--- a/storage/innobase/os/os0file.c	revid:marko.makela@strippeddeknx5qkc4
+++ b/storage/innobase/os/os0file.c	revid:marko.makela@stripped
@@ -1926,7 +1926,7 @@ os_file_set_size(
 	while (current_size < size) {
 		ulint	n_bytes;
 
-		if (size - current_size < (ib_int64_t) buf_size) {
+		if (size - current_size < (os_offset_t) buf_size) {
 			n_bytes = (ulint) (size - current_size);
 		} else {
 			n_bytes = buf_size;

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