- Remove some incorrect compile flags

  Just keep the /MDd flag but only for Windows Debug REST compile
  modified:   storage/connect/CMakeLists.txt

- Add a trace to EvalColumns
  modified:   storage/connect/connect.cc

- Remove a file not belonging to CONNECT
  deleted:    rest.h

3 files changed, 9 insertions, 38 deletions

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index fd006e104c1..be5c7034c3b 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -68,10 +68,6 @@ ELSE(NOT UNIX)
   tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
   # Add exception handling to the CONNECT project)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
-  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
   SET(IPHLPAPI_LIBRARY iphlpapi.lib)
   IF(MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
     # Connect does not work with clang-cl
@@ -324,6 +320,11 @@ IF(CONNECT_WITH_REST)
 #     If needed edit next line to set the path to libcpprest.so
       SET(REST_LIBRARY -lcpprest)
       MESSAGE (STATUS ${REST_LIBRARY})
+	ELSE(NOT UNIX)
+#     Next line sets debug compile mode matching cpprest_2_10d.dll
+#     when it was binary installed (can be change later in Visual Studio)
+#     Comment it out if not needed depending on your cpprestsdk installation.
+	  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
 	ENDIF(UNIX)
     SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp restget.cpp tabrest.h)
     add_definitions(-DREST_SUPPORT)
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc
index b1078de8eaa..461391d2896 100644
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -16,7 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 /***********************************************************************/
-/*  Author Olivier BERTRAND  bertrandop@gmail.com         2004-2017    */
+/*  Author Olivier BERTRAND  bertrandop@gmail.com         2004-2019    */
 /*                                                                     */
 /*  WHAT THIS PROGRAM DOES:                                            */
 /*  -----------------------                                            */
@@ -389,6 +389,9 @@ RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool reset, bool mrr)
 	try {
 		for (colp = tdbp->GetColumns(); rc == RC_OK && colp;
 			colp = colp->GetNext()) {
+			xtrc(2, "Going to read column %s of table %s\n",
+				colp->GetName(), tdbp->GetName());
+
 			if (reset)
 				colp->Reset();
 
diff --git a/storage/connect/rest.h b/storage/connect/rest.h
deleted file mode 100644
index f1d77e0a279..00000000000
--- a/storage/connect/rest.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/***********************************************************************/
-/*  Definitions needed by the included files.                          */
-/***********************************************************************/
-#if !defined(MY_GLOBAL_H)
-#define MY_GLOBAL_H
-typedef unsigned int uint;
-typedef unsigned int uint32;
-typedef unsigned short ushort;
-typedef unsigned long ulong;
-typedef unsigned long DWORD;
-typedef char *LPSTR;
-typedef const char *LPCSTR;
-typedef int BOOL;
-#if defined(_WINDOWS)
-typedef void *HANDLE;
-#else
-typedef int HANDLE;
-#endif
-typedef char *PSZ;
-typedef const char *PCSZ;
-typedef unsigned char BYTE;
-typedef unsigned char uchar;
-typedef long long longlong;
-typedef unsigned long long ulonglong;
-typedef char my_bool;
-struct charset_info_st {};
-typedef const charset_info_st CHARSET_INFO;
-#define FALSE 0
-#define TRUE  1
-#define Item char
-#define MY_MAX(a,b) ((a>b)?(a):(b))
-#define MY_MIN(a,b) ((a<b)?(a):(b))
-#endif // MY_GLOBAL_H
\ No newline at end of file