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 | |
| parent | b9165cb58d9f548c88181edb54800e0e96ec0b22 (diff) | |
| download | mariadb-git-cfa872f6c80e18d440f01ed0cc8f21a94eebd0d9.tar.gz | |
- Commit resolved conflicted files
modified:
storage/connect/engmsg.h
storage/connect/filamtxt.cpp
| -rw-r--r-- | storage/connect/engmsg.h | 2 | ||||
| -rw-r--r-- | storage/connect/filamtxt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/engmsg.h b/storage/connect/engmsg.h index 463e8811bfd..ad6dc6b5689 100644 --- a/storage/connect/engmsg.h +++ b/storage/connect/engmsg.h @@ -298,7 +298,7 @@ #define MSG_VALSTR_TOO_LONG "Value %s too long for string of length %d" #define MSG_VALTYPE_NOMATCH "Non matching Value types" #define MSG_VALUE_ERROR "Column %s: value is null" -#define MSG_VALUE_TOO_BIG "Value %d too big for column %s" +#define MSG_VALUE_TOO_BIG "Value %lld too big for column %s" #define MSG_VALUE_TOO_LONG "Value %s too long for column %s of length %d" #define MSG_VAL_ALLOC_ERR "Cannot allocate value node" #define MSG_VIR_NO_DELETE "Delete not allowed for %s tables" 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: |