- Commit merged and resolve

added:
  storage/connect/inihandl.h
  storage/connect/rcmsg.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/connect.h
  storage/connect/ha_connect.cc
  storage/connect/inihandl.c
  storage/connect/maputil.h
  storage/connect/odbconn.cpp
  storage/connect/osutil.c
  storage/connect/osutil.h
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/rcmsg.c
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabpivot.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/user_connect.cc
  storage/connect/value.cpp

1 files changed, 3 insertions, 2 deletions

diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 426401a0c47..67947e3042b 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -107,7 +107,7 @@ ACTIVITY defActivity = {            /* Describes activity and language */
 #endif   // XMSG  ||         NEWMSG
 
 #if defined(UNIX) || defined(UNIV_LINUX)
-int GetRcString(int id, char *buf, int bufsize);
+#include "rcmsg.h"
 #endif   // UNIX
 
 /**************************************************************************/
@@ -494,9 +494,10 @@ void *MakePtr(void *memp, OFFSET offset)
 /***********************************************************************/
 /* This routine makes an offset from a pointer new format.             */
 /***********************************************************************/
+#if 0
 OFFSET MakeOff(void *memp, void *ptr)
   {
   return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp));
   } /* end of MakeOff */
-
+#endif
 /*--------------------- End of PLUGUTIL program -----------------------*/