Fix of the build problem in the VS 2015.

Fix of some compilation warnings in VS2015
mariadb-corporation · Dec 14, 2015 · d5130e7 · d5130e7
1 parent 96e7aeb
commit d5130e7
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,6 +87,13 @@ IF(WIN32)
 
   SET(MARIADB_CLIENT_FILENAME mariadbclient.lib)
   SET(PLATFORM_DEPENDENCIES ws2_32)
+  IF (MSVC)
+    MESSAGE(STATUS "MSVC_VERSION= ${MSVC_VERSION}") 
+    IF (MSVC_VERSION EQUAL 1900)
+      MESSAGE(STATUS "Configuring to link connector against legacy_stdio_definitions") 
+      SET(PLATFORM_DEPENDENCIES ${PLATFORM_DEPENDENCIES} legacy_stdio_definitions)
+    ENDIF()
+  ENDIF()
 ELSE()
   SEARCH_LIBRARY(LIB_MATH floor m)
   SET(PLATFORM_DEPENDENCIES ${LIB_MATH})
@@ -223,6 +230,22 @@ Makefile$
 /autom4te.cache/
 )
 
+# Build source packages
+IF(GIT_BUILD_SRCPKG)
+  # get branch name
+  EXECUTE_PROCESS(COMMAND git show-branch OUTPUT_VARIABLE git_branch)
+  STRING(REGEX MATCH "\\[([^]]+)\\]" git_branch ${git_branch})
+  STRING(REGEX REPLACE "\\[|\\]" "" GIT_BRANCH ${git_branch})
+  MESSAGE(STATUS "${GIT_BRANCH}")
+  IF(WIN32)
+    EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=zip --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip)
+  ELSE()
+    EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=zip --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip)
+    EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=tar --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar)
+    EXECUTE_PROCESS(COMMAND gzip -9 -f ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar)
+  ENDIF()
+ENDIF()
+
 IF(WIN32)
   SET(DEFAULT_GENERATOR "ZIP")
 ELSE()

diff --git a/ma_statement.c b/ma_statement.c
@@ -487,7 +487,6 @@ SQLRETURN MADB_StmtPutData(MADB_Stmt *Stmt, SQLPOINTER DataPtr, SQLLEN StrLen_or
     }
   }
 
-
   /* To make sure that we will not consume the doble amount of memory, we need to send
      data via mysql_send_long_data directly to the server instead of allocating a separate
      buffer. This means we need to process Update and Insert statements row by row. */

diff --git a/test/basic.c b/test/basic.c
@@ -664,8 +664,8 @@ ODBC_TEST(t_bug30840)
 
   CHECK_ENV_RC(Env, SQLAllocHandle(SQL_HANDLE_DBC, Env, &hdbc1));
 
-  CHECK_DBC_RC(hdbc1, SQLDriverConnect(hdbc1, (HWND)HWND_DESKTOP, conn, strlen(conn),
-                                 conn_out, sizeof(conn_out), &conn_out_len,
+  CHECK_DBC_RC(hdbc1, SQLDriverConnect(hdbc1, (HWND)HWND_DESKTOP, conn, (SQLSMALLINT)strlen(conn),
+                                 conn_out, (SQLSMALLINT)sizeof(conn_out), &conn_out_len,
                                  SQL_DRIVER_PROMPT));
 
   CHECK_DBC_RC(hdbc1, SQLDisconnect(hdbc1));
@@ -942,28 +942,34 @@ ODBC_TEST(t_bug32014)
 
     /*Checking that correct cursor type is set*/
 
-    CHECK_STMT_RC(hstmt1, SQLSetStmtOption(hstmt1, SQL_CURSOR_TYPE
-            , SQL_CURSOR_FORWARD_ONLY ));
-    CHECK_STMT_RC(hstmt1, SQLGetStmtOption(hstmt1, SQL_CURSOR_TYPE,
-            (SQLPOINTER) &attr));
+    CHECK_STMT_RC(hstmt1, SQLSetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE
+            , (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY, 0));
+    CHECK_STMT_RC(hstmt1, SQLGetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE,
+            (SQLPOINTER) &attr, 0, NULL));
     is_num(attr, expectedCurType[i][SQL_CURSOR_FORWARD_ONLY]);
 
-    CHECK_STMT_RC(hstmt1, SQLSetStmtOption(hstmt1, SQL_CURSOR_TYPE,
-            SQL_CURSOR_KEYSET_DRIVEN ));
-    CHECK_STMT_RC(hstmt1, SQLGetStmtOption(hstmt1, SQL_CURSOR_TYPE,
-            (SQLPOINTER) &attr));
+    CHECK_STMT_RC(hstmt1, SQLSetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE,
+            (SQLPOINTER)SQL_CURSOR_KEYSET_DRIVEN, 0));
+    CHECK_STMT_RC(hstmt1, SQLGetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE,
+            (SQLPOINTER) &attr, 0, NULL));
     is_num(attr, expectedCurType[i][SQL_CURSOR_KEYSET_DRIVEN]);
 
-    CHECK_STMT_RC(hstmt1, SQLSetStmtOption(hstmt1, SQL_CURSOR_TYPE,
-            SQL_CURSOR_DYNAMIC ));
-    CHECK_STMT_RC(hstmt1, SQLGetStmtOption(hstmt1, SQL_CURSOR_TYPE,
-            (SQLPOINTER) &attr));
+    CHECK_STMT_RC(hstmt1, SQLSetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE,
+            (SQLPOINTER)SQL_CURSOR_DYNAMIC, 0));
+    CHECK_STMT_RC(hstmt1, SQLGetStmtAttr(hstmt1, SQL_ATTR_CURSOR_TYPE,
+            (SQLPOINTER) &attr, 0, NULL));
     is_num(attr, expectedCurType[i][SQL_CURSOR_DYNAMIC]);
 
+    /* SQLSet/GetOption are deprecated in favour of SQLSet/GetAttr
+       Leaving one just to make sure we don't have problem with old apps,
+       but disabling possible warning */
+#pragma warning(disable: 4996)
+#pragma warning(push)
     CHECK_STMT_RC(hstmt1, SQLSetStmtOption(hstmt1, SQL_CURSOR_TYPE,
             SQL_CURSOR_STATIC ));
     CHECK_STMT_RC(hstmt1, SQLGetStmtOption(hstmt1, SQL_CURSOR_TYPE,
             (SQLPOINTER) &attr));
+#pragma warning(pop)
     is_num(attr, expectedCurType[i][SQL_CURSOR_STATIC]);
 
     ODBC_Disconnect(henv1, hdbc1, hstmt1);

diff --git a/test/tap.h b/test/tap.h
@@ -726,7 +726,7 @@ int run_tests(MA_ODBC_TESTS *tests)
   utf32= mysql_get_charset_by_name(little_endian() ? "utf32" : "utf32");
   if (utf8 == NULL || utf16 == NULL || utf32 == NULL)
   {
-    fprintf(stdout, "HALT! Could not load charset info %0x %0x %0x\n", utf8, utf16, utf32);
+    fprintf(stdout, "HALT! Could not load charset info %p %p %p\n", utf8, utf16, utf32);
     return 1;
   }