summaryrefslogtreecommitdiff
path: root/storage/xtradb
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-21 18:30:34 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-21 18:30:34 +0100
commitc88e2679c60f56719b6d347c30374e69ffd3d5c4 (patch)
tree93dfaefc07a8589710c137c01c3e2ea1af9024e5 /storage/xtradb
parente638e605895fb572047ec8027e91c5438d77cbf4 (diff)
parentd1f311799988266159310afce3cf19eaf58a1fa5 (diff)
downloadmariadb-git-c88e2679c60f56719b6d347c30374e69ffd3d5c4.tar.gz
merge
Diffstat (limited to 'storage/xtradb')
-rw-r--r--storage/xtradb/os/os0file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c
index 1e863109bed..b502be1eb00 100644
--- a/storage/xtradb/os/os0file.c
+++ b/storage/xtradb/os/os0file.c
@@ -2785,7 +2785,7 @@ retry:
"InnoDB: Check also that the disk is not full"
" or a disk quota exceeded.\n",
name, (ulong) offset_high, (ulong) offset,
- (ulong) n, (ulong) len, (ulong) err);
+ (ulong) n, ret ? len : 0, (ulong) err);
if (strerror((int)err) != NULL) {
fprintf(stderr,