diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-16 20:14:36 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-16 20:14:36 +0100 |
| commit | cfa872f6c80e18d440f01ed0cc8f21a94eebd0d9 (patch) | |
| tree | 94dc43665315fcb73a14e393ac5a71bbb092cb1f /storage/connect/filamtxt.cpp | |
| parent | b9165cb58d9f548c88181edb54800e0e96ec0b22 (diff) | |
| download | mariadb-git-cfa872f6c80e18d440f01ed0cc8f21a94eebd0d9.tar.gz | |
- Commit resolved conflicted files
modified:
storage/connect/engmsg.h
storage/connect/filamtxt.cpp
Diffstat (limited to 'storage/connect/filamtxt.cpp')
| -rw-r--r-- | storage/connect/filamtxt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index 29b9f27e0d3..675c021fe51 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -538,7 +538,7 @@ bool DOSFAM::OpenTableFile(PGLOBAL g) // This is required when using Unix files under Windows and vice versa //Bin = (Blocked || Ending != CRLF); - Bin = true; // To void ftell problems + Bin = true; // To avoid ftell problems switch (mode) { case MODE_READ: |