diff options
| -rw-r--r-- | storage/connect/encas.h | 2 | ||||
| -rw-r--r-- | storage/connect/english.msg | 2 | ||||
| -rw-r--r-- | storage/connect/frcas.h | 2 | ||||
| -rw-r--r-- | storage/connect/french.msg | 2 | ||||
| -rw-r--r-- | storage/connect/frmsg.h | 2 | ||||
| -rw-r--r-- | storage/connect/ha_connect.cc | 1 | ||||
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 2 | ||||
| -rw-r--r-- | storage/connect/rcmsg.c | 4 |
8 files changed, 11 insertions, 6 deletions
diff --git a/storage/connect/encas.h b/storage/connect/encas.h index 10f05bc05f2..37e97f211e6 100644 --- a/storage/connect/encas.h +++ b/storage/connect/encas.h @@ -298,7 +298,7 @@ case MSG_VALSTR_TOO_LONG: p = "Value %s too long for string of length %d"; break; case MSG_VALTYPE_NOMATCH: p = "Non matching Value types"; break; case MSG_VALUE_ERROR: p = "Column %s: value is null"; break; - case MSG_VALUE_TOO_BIG: p = "Value %d too big for column %s"; break; + case MSG_VALUE_TOO_BIG: p = "Value %lld too big for column %s"; break; case MSG_VALUE_TOO_LONG: p = "Value %s too long for column %s of length %d"; break; case MSG_VAL_ALLOC_ERR: p = "Cannot allocate value node"; break; case MSG_VIR_NO_DELETE: p = "Delete not allowed for %s tables"; break; diff --git a/storage/connect/english.msg b/storage/connect/english.msg index e54acae3a62..9f445ca6000 100644 --- a/storage/connect/english.msg +++ b/storage/connect/english.msg @@ -344,7 +344,7 @@ 497 VALSTR_TOO_LONG "Value %s too long for string of length %d" 498 VALTYPE_NOMATCH "Non matching Value types" 499 VALUE_ERROR "Column %s: value is null" - 500 VALUE_TOO_BIG "Value %d too big for column %s" + 500 VALUE_TOO_BIG "Value %lld too big for column %s" 501 VALUE_TOO_LONG "Value %s too long for column %s of length %d" 502 VAL_ALLOC_ERR "Cannot allocate value node" 503 VIR_NO_DELETE "Delete not allowed for %s tables" diff --git a/storage/connect/frcas.h b/storage/connect/frcas.h index 47af24e6377..e9401d475ae 100644 --- a/storage/connect/frcas.h +++ b/storage/connect/frcas.h @@ -298,7 +298,7 @@ case MSG_VALSTR_TOO_LONG: p = "Valeur %s trop longue pour une chaîne de longueur %d"; break; case MSG_VALTYPE_NOMATCH: p = "Disparité types de valeur"; break; case MSG_VALUE_ERROR: p = "Colonne %s: bloc valeur nul"; break; - case MSG_VALUE_TOO_BIG: p = "Valeur %d trop grande pour la colonne %s"; break; + case MSG_VALUE_TOO_BIG: p = "Valeur %lld trop grande pour la colonne %s"; break; case MSG_VALUE_TOO_LONG: p = "Valeur %s trop longue pour la colonne %s de longueur %d"; break; case MSG_VAL_ALLOC_ERR: p = "Allocation impossible du noeud valeur"; break; case MSG_VIR_NO_DELETE: p = "Delete impossible sur les tables %s"; break; diff --git a/storage/connect/french.msg b/storage/connect/french.msg index 9c3e4e0059d..019df607be3 100644 --- a/storage/connect/french.msg +++ b/storage/connect/french.msg @@ -344,7 +344,7 @@ 497 VALSTR_TOO_LONG "Valeur %s trop longue pour une chaîne de longueur %d" 498 VALTYPE_NOMATCH "Disparité types de valeur" 499 VALUE_ERROR "Colonne %s: bloc valeur nul" - 500 VALUE_TOO_BIG "Valeur %d trop grande pour la colonne %s" + 500 VALUE_TOO_BIG "Valeur %lld trop grande pour la colonne %s" 501 VALUE_TOO_LONG "Valeur %s trop longue pour la colonne %s de longueur %d" 502 VAL_ALLOC_ERR "Allocation impossible du noeud valeur" 503 VIR_NO_DELETE "Delete impossible sur les tables %s" diff --git a/storage/connect/frmsg.h b/storage/connect/frmsg.h index ec61a71500e..d58779b948f 100644 --- a/storage/connect/frmsg.h +++ b/storage/connect/frmsg.h @@ -298,7 +298,7 @@ #define MSG_VALSTR_TOO_LONG "Valeur %s trop longue pour une chaîne de longueur %d" #define MSG_VALTYPE_NOMATCH "Disparité types de valeur" #define MSG_VALUE_ERROR "Colonne %s: bloc valeur nul" -#define MSG_VALUE_TOO_BIG "Valeur %d trop grande pour la colonne %s" +#define MSG_VALUE_TOO_BIG "Valeur %lld trop grande pour la colonne %s" #define MSG_VALUE_TOO_LONG "Valeur %s trop longue pour la colonne %s de longueur %d" #define MSG_VAL_ALLOC_ERR "Allocation impossible du noeud valeur" #define MSG_VIR_NO_DELETE "Delete impossible sur les tables %s" diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 9919af4844e..ebf286a049b 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -217,6 +217,7 @@ bool ExactInfo(void); USETEMP UseTemp(void); uint GetWorkSize(void); void SetWorkSize(uint); +extern "C" const char *msglang(void); static PCONNECT GetUser(THD *thd, PCONNECT xp); static PGLOBAL GetPlug(THD *thd, PCONNECT& lxp); diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index 88026c564bf..d8009bcc71f 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -122,7 +122,7 @@ static void global_open_error_msg(GLOBAL *g, int msgid, const char *path, int len, rno= (int)errno; char errmsg[256]= ""; - strncat(errmsg, strerror(errno), 256); + strncat(errmsg, strerror(errno), 255); switch (msgid) { diff --git a/storage/connect/rcmsg.c b/storage/connect/rcmsg.c index 43c54a20057..abd74d169cc 100644 --- a/storage/connect/rcmsg.c +++ b/storage/connect/rcmsg.c @@ -21,6 +21,10 @@ #include "msgid.h"
#endif // NEWMSG
+#if !defined(WIN32)
+#define stricmp strcasecmp
+#endif // !WIN32
+
char *msglang(void);
char *GetMsgid(int id)
|