summaryrefslogtreecommitdiff
path: root/storage/xtradb
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-21 19:15:29 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-21 19:15:29 +0100
commite6c213897d8bd39df7b8734afeabf25eca9f4e5f (patch)
tree7d5ea0d4e505561ace06c6bc1ef774581d1096b8 /storage/xtradb
parent3920d978192ddf531d323168460cc7565236bd3c (diff)
parentc88e2679c60f56719b6d347c30374e69ffd3d5c4 (diff)
downloadmariadb-git-e6c213897d8bd39df7b8734afeabf25eca9f4e5f.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 810a254f9fc..bc6c46e7678 100644
--- a/storage/xtradb/os/os0file.c
+++ b/storage/xtradb/os/os0file.c
@@ -2794,7 +2794,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,