summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2014-02-26 16:38:42 +0100
committerunknown <knielsen@knielsen-hq.org>2014-02-26 16:38:42 +0100
commit20959fa09c6d1c35793d8a577b52669f01615557 (patch)
tree1fd24ed70ccda0a6ee470577ea74cf13d98c16d8 /mysys
parent9d918f41d3910ed79bb71fd5405206b3a34c2a4b (diff)
parente90f68c0ba1802d58b06bc7178513f77b27b662b (diff)
downloadmariadb-git-20959fa09c6d1c35793d8a577b52669f01615557.tar.gz
Merge MDEV-5657 (parallel replication) to 10.0
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_iocache.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 2008a6f8860..a3cbaff68b0 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -1281,10 +1281,6 @@ read_append_buffer:
size_t transfer_len;
DBUG_ASSERT(info->append_read_pos <= info->write_pos);
- /*
- TODO: figure out if the assert below is needed or correct.
- */
- DBUG_ASSERT(pos_in_file == info->end_of_file);
copy_len=MY_MIN(Count, len_in_buff);
memcpy(Buffer, info->append_read_pos, copy_len);
info->append_read_pos += copy_len;