diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 18:27:14 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 18:27:14 +0300 |
| commit | f74853053ff7cb4420b09923d9c648620e7fa73c (patch) | |
| tree | 7df7860b9414791f11aa350b2bad082cb347d341 /storage/xtradb/fil/fil0fil.c | |
| parent | b46f14352b560a4fa6525e3bb1fd2bdfb2cbee7c (diff) | |
| parent | 96c1a87455f20db9ce651723628b4ac9a44d54a2 (diff) | |
| download | mariadb-git-f74853053ff7cb4420b09923d9c648620e7fa73c.tar.gz | |
Automatic merge
Diffstat (limited to 'storage/xtradb/fil/fil0fil.c')
| -rw-r--r-- | storage/xtradb/fil/fil0fil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c index 8121130f681..4ea3232eefb 100644 --- a/storage/xtradb/fil/fil0fil.c +++ b/storage/xtradb/fil/fil0fil.c @@ -691,7 +691,7 @@ fil_node_open_file( ut_a(space->purpose != FIL_LOG); ut_a(!trx_sys_sys_space(space->id)); - if (size_bytes < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) { + if (size_bytes < (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" @@ -3806,7 +3806,7 @@ fil_load_single_table_tablespace( /* Align the memory for file i/o if we might have O_DIRECT set */ page = ut_align(buf2, UNIV_PAGE_SIZE); - 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)) { success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE); /* We have to read the tablespace id from the file */ |