Merge branch 'master' of https://github.com/MariaDB/mariadb-connector-c

mariadb-corporation · Aug 19, 2016 · b07a173 · b07a173
2 parents c374386 + 03d35ac
commit b07a173
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/include/mysql.h b/include/mysql.h
@@ -392,9 +392,9 @@ typedef struct st_mysql_time
   my_bool       neg;
   enum enum_mysql_timestamp_type time_type;
 } MYSQL_TIME;
+#define AUTO_SEC_PART_DIGITS 39
 #endif
 
-#define AUTO_SEC_PART_DIGITS 31
 #define SEC_PART_DIGITS 6
 #define MARIADB_INVALID_SOCKET -1
 
@@ -578,11 +578,10 @@ unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
 my_bool STDCALL mariadb_reconnect(MYSQL *mysql);
 int STDCALL mariadb_cancel(MYSQL *mysql);
-void STDCALL mysql_debug(const char *debug __attribute__((unused)));
-ulong STDCALL mysql_net_read_packet(MYSQL *mysql);
-ulong STDCALL mysql_net_field_length(uchar **packet);
+void STDCALL mysql_debug(const char *debug);
+unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql);
+unsigned long STDCALL mysql_net_field_length(unsigned char **packet);
 my_bool STDCALL mysql_embedded();
-void STDCALL mysql_debug(const char *debug __attribute__((unused)));
 MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);
 
 /* Async API */

diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -353,11 +353,6 @@ IF(WIN32)
                    "SOURCE_FILE:libmariadb/libmariadb.c"
                    "ORIGINAL_FILE_NAME:libmariadb.dll"
                    "FILE_DESCRIPTION:Dynamic lib for client/server communication")
-  SET_VERSION_INFO("TARGET:mariadbclient"
-                   "FILE_TYPE:VFT_STATIC_LIB"
-                   "SOURCE_FILE:libmariadb/libmariadb.c"
-                   "ORIGINAL_FILE_NAME:mariadbclient.lib"
-                   "FILE_DESCRIPTION:Static lib for client/server communication")
 ENDIF()
 
 ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
@@ -385,20 +380,13 @@ ENDIF()
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
   TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${PROJECT_BINARY_DIR}/libmariadb/mariadbclient.def")
-  TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
-  TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${PROJECT_BINARY_DIR}/libmariadb/mariadbclient.def")
 ENDIF()
 
 SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
 SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
 
 SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
 
-IF(NOT FOR_SERVER)
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
-   ${CPACK_PACKAGE_VERSION_MAJOR}
-   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
-ENDIF()
 #
 # Installation
 #
@@ -408,8 +396,25 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/symlink.cmake)
 # There are still several projects which don't make use
 # of the config program. To make sure these programs can
 # use mariadb client library we provide libmysql symlinks
-IF(NOT WIN32 AND WITH_MYSQLCOMPAT AND NOT FOR_SERVER)
-  SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
+SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
+
+IF(NOT FOR_SERVER)
+  SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
+   ${CPACK_PACKAGE_VERSION_MAJOR}
+   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+ELSE()
+  SET(SHARED_LIB_MAJOR_VERSION 18 CACHE STRING "")
+  SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0" CACHE STRING "")
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+   SET_TARGET_PROPERTIES(libmariadb PROPERTIES 
+     VERSION ${SHARED_LIB_MAJOR_VERSION}
+     SOVERSION ${OS_SHARED_LIB_VERSION})
+  ENDIF()
+  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
+  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
+ENDIF()
+
+IF(NOT WIN32 AND WITH_MYSQLCOMPAT AND NOT FOR_SERVER)  
   create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
   create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
   create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
@@ -419,9 +424,9 @@ ENDIF()
 
 INSTALL(TARGETS
           libmariadb mariadbclient 
-          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
-          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
-          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
+          RUNTIME DESTINATION "${INSTALL_PATH}"
+          LIBRARY DESTINATION "${INSTALL_PATH}"
+          ARCHIVE DESTINATION "${INSTALL_PATH}")
 
 IF(WIN32)
    # On Windows, install PDB
@@ -431,5 +436,5 @@ IF(WIN32)
      STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
       pdb_location ${pdb_location})
    ENDIF()
-   INSTALL(FILES ${pdb_location} DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
+   INSTALL(FILES ${pdb_location} DESTINATION "${INSTALL_PATH}")
 ENDIF()