diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-11-05 16:29:58 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-11-05 16:29:58 +0400 |
| commit | ced8719400333994131aac1662e95590c78271b7 (patch) | |
| tree | 790d2bb16dfd9d0429e4a6ebd5117195a7c301a8 /storage/innobase/fil | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| parent | 0212e736136432f8d0442703b55220c0bd9c505e (diff) | |
| download | mariadb-git-ced8719400333994131aac1662e95590c78271b7.tar.gz | |
Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0fil.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c index df6dad86990..ba6f2f8666f 100644 --- a/storage/innobase/fil/fil0fil.c +++ b/storage/innobase/fil/fil0fil.c @@ -659,6 +659,7 @@ fil_node_open_file( #ifdef UNIV_HOTBACKUP if (space->id == 0) { node->size = (ulint) (size_bytes / UNIV_PAGE_SIZE); + os_file_close(node->handle); goto add_size; } #endif /* UNIV_HOTBACKUP */ @@ -3244,7 +3245,7 @@ fil_load_single_table_tablespace( fprintf(stderr, "InnoDB: Renaming tablespace %s of id %lu,\n" "InnoDB: to %s_ibbackup_old_vers_<timestamp>\n" - "InnoDB: because its size %lld is too small" + "InnoDB: because its size %" PRId64 " is too small" " (< 4 pages 16 kB each),\n" "InnoDB: or the space id in the file header" " is not sensible.\n" |