From 29becc2971c39c81b944eedbf68ead233dc8ac56 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Fri, 14 Dec 2018 14:42:06 +0300
Subject: [PATCH] MCOL-498 Passed test100.

---
 writeengine/shared/.we_fileop.h.swo | Bin 16384 -> 0 bytes
 writeengine/shared/we_fileop.cpp    |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 writeengine/shared/.we_fileop.h.swo

diff --git a/writeengine/shared/.we_fileop.h.swo b/writeengine/shared/.we_fileop.h.swo
deleted file mode 100644
index 46e47f43e9e4b891f218888636cb9d5f0e6c00e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
O?;vOn>Ub*>WB&%GBhE|!

diff --git a/writeengine/shared/we_fileop.cpp b/writeengine/shared/we_fileop.cpp
index e08bea3fb..e028705f1 100644
--- a/writeengine/shared/we_fileop.cpp
+++ b/writeengine/shared/we_fileop.cpp
@@ -1104,7 +1104,7 @@ int FileOp::initColumnExtent(
 
         int savedErrno = 0;
         // MCOL-498 Try to preallocate the space, fallback to write if fallocate has failed
-        if (!bOptExtension || pFile->fallocate(0, currFileSize, writeSize))
+        if ( !bOptExtension || ( nBlocks < 300 && pFile->fallocate(0, currFileSize, writeSize) ))
         {
             savedErrno = errno;
             // Log the failed fallocate() call result
@@ -1870,7 +1870,7 @@ int FileOp::initDctnryExtent(
         int savedErrno = 0;
         // MCOL-498 Try to preallocate the space, fallback to write if fallocate
         // has failed
-        if (!bOptExtension || pFile->fallocate(0, currFileSize, writeSize))
+        //if (!bOptExtension || pFile->fallocate(0, currFileSize, writeSize))
         {
             // Log the failed  fallocate() call result
             if ( bOptExtension )