diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-27 14:56:20 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-27 14:56:20 +0200 |
| commit | 86a3343191780854b3bed4ccedc8e56f72f2faab (patch) | |
| tree | 323238a10842e4eb6631e666e473b0a106ebdd2f /storage/connect/filamtxt.cpp | |
| parent | 66ffa09491e19a2d8c2f7638741909d13c7b25d7 (diff) | |
| download | mariadb-git-86a3343191780854b3bed4ccedc8e56f72f2faab.tar.gz | |
- Fix a bug in DOSFAM::OpenTableFile. Bin was not set to TRUE for blocked
tables. This caused a CR character to be left in the line and in
particular caused the updelx test to fail on Windows.
modified:
storage/connect/filamtxt.cpp
Diffstat (limited to 'storage/connect/filamtxt.cpp')
| -rw-r--r-- | storage/connect/filamtxt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index a3ca20bbdb4..5cabf980554 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -536,7 +536,7 @@ bool DOSFAM::OpenTableFile(PGLOBAL g) PDBUSER dbuserp = PlgGetUser(g); // This is required when using Unix files under Windows and vice versa - Bin = (Ending != CRLF); + Bin = (Blocked || Ending != CRLF); switch (mode) { case MODE_READ: @@ -578,7 +578,7 @@ bool DOSFAM::OpenTableFile(PGLOBAL g) } // endswitch Mode // For blocked I/O or for moving lines, open the table in binary - strcat(opmode, (Blocked || Bin) ? "b" : "t"); + strcat(opmode, (Bin) ? "b" : "t"); // Now open the file stream PlugSetPath(filename, To_File, Tdbp->GetPath()); |