Version bump -> 2.0.16

mariadb-corporation · May 24, 2017 · 41de3ed · 41de3ed
1 parent 6a1619b
commit 41de3ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,10 +22,10 @@ cmake_minimum_required(VERSION 2.8)
 
 SET(MARIADB_ODBC_VERSION_MAJOR 2)
 SET(MARIADB_ODBC_VERSION_MINOR 0)
-SET(MARIADB_ODBC_VERSION_PATCH 15)
+SET(MARIADB_ODBC_VERSION_PATCH 16)
 SET(MARIADB_ODBC_VERSION_QUALITY "ga")
 
-SET(MARIADB_ODBC_VERSION "02.00.0015")
+SET(MARIADB_ODBC_VERSION "02.00.0016")
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ma_odbc_version.h.in
                ${CMAKE_SOURCE_DIR}/ma_odbc_version.h)

diff --git a/maodbca.rc b/maodbca.rc
diff --git a/maodbcu.rc b/maodbcu.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,15,0
- PRODUCTVERSION 2,0,15,0
+ FILEVERSION 2,0,16,0
+ PRODUCTVERSION 2,0,16,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MariaDB Corporation AB"
             VALUE "FileDescription", "MariaDB ODBC Unicode Drvier"
-            VALUE "FileVersion", "2.0.15.0"
+            VALUE "FileVersion", "2.0.16.0"
             VALUE "InternalName", "ma_odbc_u"
-            VALUE "LegalCopyright", "Copyright (C) 2013, 2016"
+            VALUE "LegalCopyright", "Copyright (C) 2013, 2017"
             VALUE "OriginalFilename", "maodbc.dll"
             VALUE "ProductName", "MariaDB ODBC Unicode Driver"
-            VALUE "ProductVersion", "2.0.15.0"
+            VALUE "ProductVersion", "2.0.16.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/test/tap.h b/test/tap.h
@@ -629,11 +629,11 @@ SQLHANDLE DoConnect(SQLHANDLE *Connection,
   SQLSMALLINT Length;
 
   /* my_options |= 4; */ /* To enable debug */
-  _snprintf(DSNString, 1024, "DSN=%s;UID=%s;PWD={%s};PORT=%u;DATABASE=%s;OPTION=%ul;SERVER=%s;%s", dsn ? dsn : (const char*)my_dsn,
+  _snprintf(DSNString, 1024, "DSN=%s;UID=%s;PWD={%s};PORT=%u;DATABASE=%s;OPTION=%lu;SERVER=%s;%s", dsn ? dsn : (const char*)my_dsn,
            uid ? uid : (const char*)my_uid, pwd ? pwd : (const char*)my_pwd, port ? port : my_port,
            schema ? schema : (const char*)my_schema, options ? *options : my_options, server ? server : (const char*)my_servername,
            add_parameters ? add_parameters : "");
-  diag("DSN=%s;UID=%s;PWD={%s};PORT=%u;DATABASE=%s;OPTION=%ul;SERVER=%s;%s", dsn ? dsn : (const char*)my_dsn,
+  diag("DSN=%s;UID=%s;PWD={%s};PORT=%u;DATABASE=%s;OPTION=%lu;SERVER=%s;%s", dsn ? dsn : (const char*)my_dsn,
            uid ? uid : (const char*)my_uid, "********", port ? port : my_port,
            schema ? schema : (const char*)my_schema, options ? *options : my_options, server ? server : (const char*)my_servername,
            add_parameters ? add_parameters : "");