summaryrefslogtreecommitdiff
path: root/storage/connect/engmsg.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-11-16 20:14:36 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2014-11-16 20:14:36 +0100
commitcfa872f6c80e18d440f01ed0cc8f21a94eebd0d9 (patch)
tree94dc43665315fcb73a14e393ac5a71bbb092cb1f /storage/connect/engmsg.h
parentb9165cb58d9f548c88181edb54800e0e96ec0b22 (diff)
downloadmariadb-git-cfa872f6c80e18d440f01ed0cc8f21a94eebd0d9.tar.gz
- Commit resolved conflicted files
modified: storage/connect/engmsg.h storage/connect/filamtxt.cpp
Diffstat (limited to 'storage/connect/engmsg.h')
-rw-r--r--storage/connect/engmsg.h2
1 files changed, 1 insertions, 1 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"