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 | f676d46d593d48cfee4108922d423071f4b4172e (patch) | |
| tree | cb932f938995982abda106299cab33f9627cb16e /storage/xtradb | |
| parent | 305580dd125982e2fe86047fda50fdcc64081dd1 (diff) | |
| parent | 500b4c819d146e955f58648630f0afd930e1b814 (diff) | |
| download | mariadb-git-f676d46d593d48cfee4108922d423071f4b4172e.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'storage/xtradb')
| -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" |