- Commit resolved conflicted files

modified:
  storage/connect/engmsg.h
  storage/connect/filamtxt.cpp

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"

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: