From 3eed852604d88ddfe4f096530f23e703cdfad171 Mon Sep 17 00:00:00 2001
From: Lawrin Novitsky <lawrin.novitsky@mariadb.com>
Date: Tue, 13 Nov 2018 00:01:24 +0100
Subject: [PATCH] Version bumb -> 3.0.7

ALso, fix of one compilation warning and of (relatively) recently introduced memory leak
---
 CMakeLists.txt |   4 ++--
 ma_statement.c |   2 ++
 ma_typeconv.c  |   2 +-
 maodbca.rc     | Bin 4660 -> 4660 bytes
 maodbcu.rc     |   8 ++++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef5c48e6..71d75782 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,10 @@ cmake_minimum_required(VERSION 2.8)
 
 SET(MARIADB_ODBC_VERSION_MAJOR 3)
 SET(MARIADB_ODBC_VERSION_MINOR 0)
-SET(MARIADB_ODBC_VERSION_PATCH 6)
+SET(MARIADB_ODBC_VERSION_PATCH 7)
 SET(MARIADB_ODBC_VERSION_QUALITY "ga")
 
-SET(MARIADB_ODBC_VERSION "03.00.0006")
+SET(MARIADB_ODBC_VERSION "03.00.0007")
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ma_odbc_version.h.in
                ${CMAKE_SOURCE_DIR}/ma_odbc_version.h)
diff --git a/ma_statement.c b/ma_statement.c
index ddb0f634..977e3103 100644
--- a/ma_statement.c
+++ b/ma_statement.c
@@ -3491,12 +3491,14 @@ SQLRETURN MADB_StmtColumns(MADB_Stmt *Stmt,
     MADB_FixColumnDataTypes(Stmt, SqlColumnsColType);
   }
 
+  MADB_FREE(ColumnsPart);
   MADB_DynstrFree(&StmtStr);
   MDBUG_C_DUMP(Stmt->Connection, ret, d);
 
   return ret;
 
 dynerror:
+  MADB_FREE(ColumnsPart);
   MADB_SetError(&Stmt->Error, MADB_ERR_HY001, NULL, 0);
   return Stmt->Error.ReturnValue;
 }
diff --git a/ma_typeconv.c b/ma_typeconv.c
index 9ac8f767..2b7cb7df 100644
--- a/ma_typeconv.c
+++ b/ma_typeconv.c
@@ -74,7 +74,7 @@ SQLRETURN MADB_Str2Ts(const char *Str, size_t Length, SQL_TIMESTAMP_STRUCT *Ts,
   {
     size_t FracMulIdx= End - (Frac + 1) - 1/*to get index array index */;
     /* ODBC - nano-seconds */
-    if (sscanf(Start, "%hd:%hu:%hu.%9lu", &Ts->hour, &Ts->minute,
+    if (sscanf(Start, "%hd:%hu:%hu.%9u", &Ts->hour, &Ts->minute,
       &Ts->second, &Ts->fraction) < 4)
     {
       return MADB_SetError(Error, MADB_ERR_22008, NULL, 0);
diff --git a/maodbca.rc b/maodbca.rc
index 519918eac9368b1632a08a097cdbe2123bd6e35b..74dfe2e28519c90e562aec21a893fe3bef387e29 100644
GIT binary patch
delta 54
zcmdm@vPES>7YC#H<Zcc_M)S>kIarxl%^CC<3?^^n)!qDsTZ{?L6`yRuC$!mu?+-Ho
Dtwj$3

delta 54
zcmdm@vPES>7YC!+<Zcc_MzhU(Iarxl%^36;3?^^n)!qDsTZ{?L6`yRuC$!mu?+-Ho
Dth^5W

diff --git a/maodbcu.rc b/maodbcu.rc
index 43170a6f..b1ec4747 100644
--- a/maodbcu.rc
+++ b/maodbcu.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,6,0
- PRODUCTVERSION 3,0,6,0
+ FILEVERSION 3,0,7,0
+ PRODUCTVERSION 3,0,7,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", "3.0.6.0"
+            VALUE "FileVersion", "3.0.7.0"
             VALUE "InternalName", "ma_odbc_u"
             VALUE "LegalCopyright", "Copyright (C) 2013, 2018"
             VALUE "OriginalFilename", "maodbc.dll"
             VALUE "ProductName", "MariaDB ODBC Unicode Driver"
-            VALUE "ProductVersion", "3.0.6.0"
+            VALUE "ProductVersion", "3.0.7.0"
         END
     END
     BLOCK "VarFileInfo"