Automatic merge with 5.1

52e4fce8 · Michael Widenius · 173820a5 · d2472af7 · 52e4fce8
Commit 52e4fce8 authored May 04, 2011 by Michael Widenius
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/xtradb/fil/fil0fil.c storage/xtradb/fil/fil0fil.c +1 -1

No files found.
--- a/storage/xtradb/fil/fil0fil.c
+++ b/storage/xtradb/fil/fil0fil.c
@@ -3786,7 +3786,7 @@ fil_load_single_table_tablespace(

 	size = (((ib_uint64_t)size_high) << 32) + (ib_uint64_t)size_low;
 #ifndef UNIV_HOTBACKUP
-	if (size < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) {
+	if (size < (ib_uint64_t) (FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE)) {
 		fprintf(stderr,
 			"InnoDB: Error: the size of single-table tablespace"
 			" file %s\n"