- Calculate next position in filamap without assuming ENDING option is true.

modified:
  storage/connect/filamap.cpp

- ftell error: indicate in the error msg that is can be due to wrong ENDING value.
  filamtxt.cpp (MDEV-7030)
modified:
  storage/connect/filamtxt.cpp

- Change STRING according to Alexander Barkov remarks.
  Suppress the wrong Strz function. The unconditional function strz is no more
  used for s->db and s->table_name because they are zero terminated.
modified:
  storage/connect/ha_connect.cc
  storage/connect/xobject.cpp

- Change version number
modified:
  storage/connect/filamap.cpp

- Change PATH_MAX to FN_REFLEN (MDEV-7036)
modified:
  storage/connect/os.h
  storage/connect/tabmul.cpp

- Fix bug by adding a void argument for OP_NOT in Makefilter.
modified:
  storage/connect/filter.cpp

- Begin implementing XMSG style
  Two new system variables are defined:
  msg_lang ENUM session
  errmsg_dir_path STR global readonly
  This is a work in progress.
modified:
  storage/connect/ha_connect.cc
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/rcmsg.c
  storage/connect/resource.h

1 files changed, 5 insertions, 3 deletions

diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 1bed67d402f..b195058f720 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -82,7 +82,8 @@ extern HINSTANCE s_hModule;                   /* Saved module handle    */
 #endif   // WIN32
 
 #if defined(XMSG)
-extern char msglang[];
+extern char *msg_path;
+char *msglang(void);
 #endif   // XMSG
 
 /***********************************************************************/
@@ -326,8 +327,9 @@ char *PlugReadMessage(PGLOBAL g, int mid, char *m)
   char *msg;
   FILE *mfile = NULL;
 
-  GetPrivateProfileString("Message", msglang, "Message\\english.msg",
-                                     msgfile, _MAX_PATH, plgini);
+//GetPrivateProfileString("Message", msglang, "Message\\english.msg",
+//                                   msgfile, _MAX_PATH, plgini);
+  strcat(strcat(strcpy(msgfile, msg_path), msglang()), ".msg");
 
   if (!(mfile = fopen(msgfile, "rt"))) {
     sprintf(stmsg, "Fail to open message file %s for %s", msgfile, msglang);