Hello community,
here is the log from the commit of package mariadb-connector-odbc for
openSUSE:Factory checked in at 2020-04-14 15:12:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-odbc (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-odbc"
Tue Apr 14 15:12:15 2020 rev:9 rq:793816 version:3.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/mariadb-connector-odbc/mariadb-connector-odbc.changes
2020-04-04 12:23:45.895847947 +0200
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-odbc.new.2738/mariadb-connector-odbc.changes
2020-04-14 16:24:14.015740375 +0200
@@ -1,0 +2,8 @@
+Tue Apr 14 10:39:12 UTC 2020 - Adam Majer <[email protected]>
+
+- New upstream version 3.1.7. Fixes include,
+ * ODBC-276 - Update of Binary data containing 0x00 does not work
+ * ODBC-277 - Memory Corruption from Incorrect Type for SQL_IDENTIFIER_CASE
+ * ODBC-274 - Support INSERT/REPLACE ... RETURNING (requires MariaDB 10.5)
+
+-------------------------------------------------------------------
Old:
----
mariadb-connector-odbc-3.1.6-ga-src.tar.gz
mariadb-connector-odbc-3.1.6-ga-src.tar.gz.asc
New:
----
mariadb-connector-odbc-3.1.7-ga-src.tar.gz
mariadb-connector-odbc-3.1.7-ga-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-odbc.spec ++++++
--- /var/tmp/diff_new_pack.0ohrpq/_old 2020-04-14 16:24:14.483740805 +0200
+++ /var/tmp/diff_new_pack.0ohrpq/_new 2020-04-14 16:24:14.487740809 +0200
@@ -17,7 +17,7 @@
Name: mariadb-connector-odbc
-Version: 3.1.6
+Version: 3.1.7
Release: 0
Summary: MariaDB ODBC Connector
License: LGPL-2.1-or-later
@@ -36,8 +36,8 @@
BuildRequires: cmake > 3.5.0
BuildRequires: gcc-c++
# This is actually MariaDB -devel package(s)
-BuildRequires: libmariadb-devel
-BuildRequires: libmariadbprivate
+BuildRequires: libmariadb-devel >= 3.1.7
+BuildRequires: libmariadbprivate >= 3.1.7
BuildRequires: openssl-devel
BuildRequires: unixODBC-devel
Obsoletes: MyODBC-unixODBC <= 5.1.9
++++++ mariadb-connector-odbc-3.1.6-ga-src.tar.gz ->
mariadb-connector-odbc-3.1.7-ga-src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/CMakeLists.txt
new/mariadb-connector-odbc-3.1.7-ga-src/CMakeLists.txt
--- old/mariadb-connector-odbc-3.1.6-ga-src/CMakeLists.txt 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/CMakeLists.txt 2020-04-07
22:32:37.000000000 +0200
@@ -22,10 +22,10 @@
SET(MARIADB_ODBC_VERSION_MAJOR 3)
SET(MARIADB_ODBC_VERSION_MINOR 1)
-SET(MARIADB_ODBC_VERSION_PATCH 6)
+SET(MARIADB_ODBC_VERSION_PATCH 7)
SET(MARIADB_ODBC_VERSION_QUALITY "ga")
-SET(MARIADB_ODBC_VERSION "03.01.0006")
+SET(MARIADB_ODBC_VERSION "03.01.0007")
SET(MARIADB_DEFAULT_PLUGINS_SUBDIR "plugin")
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ma_odbc_version.h.in
@@ -338,6 +338,8 @@
SET(CPACK_PACKAGE_NAME "mariadb-connector-odbc")
IF(WIN32)
ADD_SUBDIRECTORY(wininstall)
+ ADD_EXECUTABLE(install_driver osxinstall/install_driver.c)
+ TARGET_LINK_LIBRARIES(install_driver ${PLATFORM_DEPENDENCIES}
${ODBC_INSTLIBS})
ELSE()
IF(APPLE)
MESSAGE(STATUS "Configuring to generate PKG package")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-odbc-3.1.6-ga-src/appveyor-download.bat
new/mariadb-connector-odbc-3.1.7-ga-src/appveyor-download.bat
--- old/mariadb-connector-odbc-3.1.6-ga-src/appveyor-download.bat
1970-01-01 01:00:00.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/appveyor-download.bat
2020-04-07 22:32:37.000000000 +0200
@@ -0,0 +1,17 @@
+@echo off
+set
archive=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+set
last=http://mirror.i3d.net/pub/mariadb//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+
+curl -fsS -o server.msi %archive%
+
+if %ERRORLEVEL% == 0 goto end
+
+
+curl -fsS -o server.msi %last%
+if %ERRORLEVEL% == 0 goto end
+
+echo Failure Reason Given is %errorlevel%
+exit /b %errorlevel%
+
+:end
+echo "File found".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/appveyor.yml
new/mariadb-connector-odbc-3.1.7-ga-src/appveyor.yml
--- old/mariadb-connector-odbc-3.1.6-ga-src/appveyor.yml 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/appveyor.yml 2020-04-07
22:32:37.000000000 +0200
@@ -1,11 +1,15 @@
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- DB: 10.4.6
+ DB: 10.4.12
CMAKE_PARAM_G: 'Visual Studio 14 2015 Win64'
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- DB: 10.4.6
+ DB: 10.4.12
+ CMAKE_PARAM_G: 'Visual Studio 15 2017 Win64'
+
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ DB: 10.5.0
CMAKE_PARAM_G: 'Visual Studio 15 2017 Win64'
# scripts that are called at very beginning, before repo cloning
@@ -38,8 +42,7 @@
after_build:
# download and install MariaDB Server
- - cmd: set
FILE=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
- - ps: Start-FileDownload $Env:FILE -FileName server.msi -Timeout 900000
+ - cmd: appveyor-download.bat
- msiexec /i server.msi INSTALLDIR=c:\mariadb-server SERVICENAME=mariadb
/qn
# create test database
- c:\mariadb-server\bin\mysql.exe -e "CREATE DATABASE odbc_test"
--user=root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/ma_connection.c
new/mariadb-connector-odbc-3.1.7-ga-src/ma_connection.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/ma_connection.c 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/ma_connection.c 2020-04-07
22:32:37.000000000 +0200
@@ -1336,7 +1336,7 @@
MADB_SET_NUM_VAL(SQLUSMALLINT, InfoValuePtr, SQL_GB_NO_RELATION,
StringLengthPtr);
break;
case SQL_IDENTIFIER_CASE:
- MADB_SET_NUM_VAL(SQLUINTEGER, InfoValuePtr, SQL_IC_MIXED, StringLengthPtr);
+ MADB_SET_NUM_VAL(SQLUSMALLINT, InfoValuePtr, SQL_IC_MIXED,
StringLengthPtr);
break;
case SQL_IDENTIFIER_QUOTE_CHAR:
SLen= (SQLSMALLINT)MADB_SetString(isWChar ? &Dbc->Charset : NULL, (void
*)InfoValuePtr, BUFFER_CHAR_LEN(BufferLength, isWChar),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/ma_helper.c
new/mariadb-connector-odbc-3.1.7-ga-src/ma_helper.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/ma_helper.c 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/ma_helper.c 2020-04-07
22:32:37.000000000 +0200
@@ -101,7 +101,7 @@
CloseMultiStatements(Stmt);
/* Last paranoid attempt make sure that we did not have a parsing error.
- More to preserve "backward-compatimility" - we did this before, but
before trying to
+ More to preserve "backward-compatibility" - we did this before, but
before trying to
prepare "multi-statement". */
if (i == 0 && Stmt->Error.NativeError !=1295 /*ER_UNSUPPORTED_PS*/)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/ma_parse.c
new/mariadb-connector-odbc-3.1.7-ga-src/ma_parse.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/ma_parse.c 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/ma_parse.c 2020-04-07
22:32:37.000000000 +0200
@@ -270,7 +270,7 @@
{
return MADB_QUERY_SELECT;
}
- if (_strnicmp(Token1, "INSERT", 6) == 0)
+ if (_strnicmp(Token1, "INSERT", 6) == 0 || _strnicmp(Token1, "REPLACE", 7)
== 0)
{
return MADB_QUERY_INSERT;
}
@@ -415,6 +415,7 @@
{
/* We are currently at 2nd token of statement, and getting previous
token position from Tokens array*/
StmtType= MADB_GetQueryType(MADB_Token(Query, Query->Tokens.elements -
2), p);
+
Query->ReturnsResult= Query->ReturnsResult ||
!QUERY_DOESNT_RETURN_RESULT(StmtType);
MADB_AddSubQuery(Query, CurQuery, StmtType);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/ma_statement.c
new/mariadb-connector-odbc-3.1.7-ga-src/ma_statement.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/ma_statement.c 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/ma_statement.c 2020-04-07
22:32:37.000000000 +0200
@@ -536,6 +536,12 @@
MADB_ResetParser(Stmt, StatementText, TextLength);
MADB_ParseQuery(&Stmt->Query);
+ if ((Stmt->Query.QueryType == MADB_QUERY_INSERT || Stmt->Query.QueryType ==
MADB_QUERY_UPDATE || Stmt->Query.QueryType == MADB_QUERY_DELETE)
+ && MADB_FindToken(&Stmt->Query, "RETURNING"))
+ {
+ Stmt->Query.ReturnsResult= '\1';
+ }
+
/* if we have multiple statements we save single statements in
Stmt->StrMultiStmt
and store the number in Stmt->MultiStmts */
if (QueryIsPossiblyMultistmt(&Stmt->Query) &&
QUERY_IS_MULTISTMT(Stmt->Query) &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-odbc-3.1.6-ga-src/ma_string.c
new/mariadb-connector-odbc-3.1.7-ga-src/ma_string.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/ma_string.c 2020-01-21
10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/ma_string.c 2020-04-07
22:32:37.000000000 +0200
@@ -209,8 +209,9 @@
{
int UniqueCount=0, PrimaryCount= 0;
int i, Flag= 0;
- char *Column= NULL;
+ char *Column= NULL, *Escaped= NULL;
SQLLEN StrLength;
+ unsigned long EscapedLength;
for (i= 0; i < MADB_STMT_COLUMN_COUNT(Stmt); i++)
{
@@ -276,15 +277,18 @@
else
{
Column= MADB_CALLOC(StrLength + 1);
- Stmt->Methods->GetData(Stmt,i+1, SQL_C_CHAR, Column, StrLength + 1,
NULL, TRUE);
+ Stmt->Methods->GetData(Stmt,i+1, SQL_C_CHAR, Column, StrLength + 1,
&StrLength, TRUE);
+ Escaped = MADB_CALLOC(2 * StrLength + 1);
+ EscapedLength= mysql_real_escape_string(Stmt->Connection->mariadb,
Escaped, Column, (unsigned long)StrLength);
+
if (MADB_DynstrAppend(DynString, "= '") ||
- MADB_DynstrAppend(DynString, Column) ||
+ MADB_DynstrAppend(DynString, Escaped) ||//, EscapedLength) ||
MADB_DynstrAppend(DynString, "'"))
{
goto memerror;
}
MADB_FREE(Column);
- Column= NULL;
+ MADB_FREE(Escaped);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-odbc-3.1.6-ga-src/osxinstall/install_driver.c
new/mariadb-connector-odbc-3.1.7-ga-src/osxinstall/install_driver.c
--- old/mariadb-connector-odbc-3.1.6-ga-src/osxinstall/install_driver.c
2020-01-21 10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/osxinstall/install_driver.c
2020-04-07 22:32:37.000000000 +0200
@@ -18,9 +18,10 @@
*************************************************************************************/
#define SQL_NOUNICODEMAP
-#include <odbcinst.h>
+
#include <stdio.h>
#include <string.h>
+#include <stdarg.h>
#ifdef _WIN32
# include <windows.h>
@@ -44,6 +45,9 @@
}
#endif
+#include <odbcinst.h>
+
+
int Usage()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-odbc-3.1.6-ga-src/wininstall/CMakeLists.txt
new/mariadb-connector-odbc-3.1.7-ga-src/wininstall/CMakeLists.txt
--- old/mariadb-connector-odbc-3.1.6-ga-src/wininstall/CMakeLists.txt
2020-01-21 10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/wininstall/CMakeLists.txt
2020-04-07 22:32:37.000000000 +0200
@@ -92,11 +92,11 @@
ADD_CUSTOM_TARGET(
ODBC_WIX
- DEPENDS mariadb_odbc.xml
+ DEPENDS mariadb_odbc.xm binaries_dir.xm
COMMAND ${WIX_DIR}candle.exe -ext WixUIExtension -ext WixUtilExtension
mariadb_odbc.xml -o mariadb_odbc.wixobj)
ADD_DEPENDENCIES(${MSI_PACKAGE} ODBC_WIX)
-ADD_DEPENDENCIES(ODBC_WIX maodbc maodbcs change_dsns_driver binaries_dir.xml
mariadb_odbc.xml)
+ADD_DEPENDENCIES(ODBC_WIX maodbc maodbcs change_dsns_driver)
IF(NOT USE_SYSTEM_INSTALLED_LIB)
ADD_DEPENDENCIES(ODBC_WIX maodbc maodbcs dialog caching_sha2_password
auth_gssapi_client sha256_password mysql_clear_password)
ENDIF()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-odbc-3.1.6-ga-src/wininstall/mariadb_odbc.xml.in
new/mariadb-connector-odbc-3.1.7-ga-src/wininstall/mariadb_odbc.xml.in
--- old/mariadb-connector-odbc-3.1.6-ga-src/wininstall/mariadb_odbc.xml.in
2020-01-21 10:35:57.000000000 +0100
+++ new/mariadb-connector-odbc-3.1.7-ga-src/wininstall/mariadb_odbc.xml.in
2020-04-07 22:32:37.000000000 +0200
@@ -6,6 +6,10 @@
Manufacturer="@PRODUCT_MANUFACTURER@"
UpgradeCode="b43bad5d-118f-4368-8977-e60fd4dd4317">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"
Platform="@WIXPLATFORM@"/>
+ <Condition Message="This product requires Windows 8 or newer.">
+ <![CDATA[Installed OR VersionNT >= 602]]>
+ </Condition>
+
<MajorUpgrade DowngradeErrorMessage="A newer version of @PRODUCT_NAME@ is
already installed." />
<MediaTemplate EmbedCab="yes"/>
<UIRef Id="WixUI_Mondo" />
