diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-04 11:35:51 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-04 11:35:51 +0300 |
| commit | 52e4fce886a7a41bd85a77081e3c97839ebe810b (patch) | |
| tree | cb932f938995982abda106299cab33f9627cb16e /storage | |
| parent | 173820a553de5c3a133e6c1d93845e6c640f3ed7 (diff) | |
| parent | d2472af7f5183896e2ba278ecadd4648e21c5cb0 (diff) | |
| download | mariadb-git-52e4fce886a7a41bd85a77081e3c97839ebe810b.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/fil/fil0fil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c index d124b845a8e..3c535bf7331 100644 --- 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" |