Hello community,
here is the log from the commit of package mariadb-connector-c for openSUSE:Factory checked in at 2017-07-17 09:10:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-c (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-c.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-c"
Mon Jul 17 09:10:59 2017 rev:4 rq:510115 version:2.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb-connector-c/mariadb-connector-c.changes 2017-05-16 14:44:22.725675204 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb-connector-c.new/mariadb-connector-c.changes 2017-07-17 09:11:01.437071855 +0200
@@ -1,0 +2,15 @@
+Thu Jul 13 12:15:06 UTC 2017 - adam.majer@suse.de
+
+- New upstream version 2.3.3:
+ * Fixed build for big-endian platforms. Obsoletes
+ bigendian_type_fixes.patch
+ * Changed parameter type for parameter reconnect in
+ mysql_optionsv from uint to my_bool
+- absolute_path_fix.patch: refreshed
+
+-------------------------------------------------------------------
+Thu Jul 13 12:00:32 UTC 2017 - olaf@aepfle.de
+
+- Remove unused gnutls from buildrequires
+
+-------------------------------------------------------------------
Old:
----
bigendian_type_fixes.patch
mariadb-connector-c-2.3.2-src.tar.gz
mariadb-connector-c-2.3.2-src.tar.gz.asc
New:
----
mariadb-connector-c-2.3.3-src.tar.gz
mariadb-connector-c-2.3.3-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-c.spec ++++++
--- /var/tmp/diff_new_pack.Lv40ja/_old 2017-07-17 09:11:02.032987919 +0200
+++ /var/tmp/diff_new_pack.Lv40ja/_new 2017-07-17 09:11:02.036987356 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mariadb-connector-c
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%bcond_with sqlite3
%define sover 2
%define libname libmariadb
@@ -24,24 +25,22 @@
%endif
Name: mariadb-connector-c
-Version: 2.3.2
+Version: 2.3.3
Release: 0
-License: LGPL-2.1+
Summary: MariaDB connector in C
-Url: https://github.com/MariaDB/mariadb-connector-c
+License: LGPL-2.1+
Group: Development/Libraries/C and C++
-Source: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz
-Source1: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz.asc
+Url: https://github.com/MariaDB/mariadb-connector-c
+Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz
+Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc
# Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation...
Source2: mariadb.keyring
Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch
-Patch2: bigendian_type_fixes.patch
Patch3: absolute_path_fix.patch
Patch4: private_library.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: curl-devel
-BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(krb5-gssapi)
BuildRequires: pkgconfig(openssl)
@@ -55,8 +54,8 @@
C or C++ to MariaDB and MySQL databases.
%package -n %{libname}%{sover}
-Group: System/Libraries
Summary: MariaDB connector in C
+Group: System/Libraries
%description -n %{libname}%{sover}
MariaDB Connector is used to connect applications developed in
@@ -65,8 +64,8 @@
This package holds the runtime components.
%package -n %{libname}_plugins
-Group: SystemLibraries
Summary: Plugins for the MariaDB C Connector
+Group: SystemLibraries
%description -n %{libname}_plugins
MariaDB Connector is used to connect applications developed in
@@ -75,8 +74,8 @@
This package holds MariaDB library plugins.
%package -n %{libname}private
-Group: System/Libraries
Summary: Additional internal libraries for the MariaDB C Connector
+Group: System/Libraries
%description -n %{libname}private
MariaDB Connector is used to connect applications developed in
@@ -85,10 +84,10 @@
This package holds the runtime components with private API.
%package -n %{libname}-devel
-Group: Development/Libraries/C and C++
Requires: %{libname}%{sover} = %{version}
Requires: pkgconfig(openssl)
Summary: Development files for the MariaDB Connector C API
+Group: Development/Libraries/C and C++
%description -n %{libname}-devel
MariaDB Connector is used to connect applications developed in
@@ -99,7 +98,6 @@
%prep
%setup -q -n %{name}-%{version}-src
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -116,8 +114,7 @@
%install
%cmake_install
-rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt \
- %{buildroot}%{_includedir}/mariadb/*.am
+rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt
rm %{buildroot}%{_libdir}/mariadb/*.a
rm %{buildroot}%{_libdir}/*.a
++++++ absolute_path_fix.patch ++++++
--- /var/tmp/diff_new_pack.Lv40ja/_old 2017-07-17 09:11:02.064983413 +0200
+++ /var/tmp/diff_new_pack.Lv40ja/_new 2017-07-17 09:11:02.064983413 +0200
@@ -2,13 +2,13 @@
Date: Fri Mar 3 15:59:09 CET 2017
Summary: Remove pure ugliness with paths
-Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in
===================================================================
---- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in
-@@ -3,12 +3,12 @@
- #include
+--- mariadb-connector-c-2.3.3-src.orig/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in
+@@ -2,12 +2,12 @@
#include
+ #include
-#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql"
-#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \
@@ -22,10 +22,10 @@
#define SOCKET "@MYSQL_UNIX_ADDR@"
#define PORT "@MYSQL_PORT@"
-Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt
===================================================================
---- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt
+--- mariadb-connector-c-2.3.3-src.orig/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt
@@ -430,9 +430,9 @@ ENDIF()
INSTALL(TARGETS
++++++ mariadb-connector-c-2.3.2-src.tar.gz -> mariadb-connector-c-2.3.3-src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/CMakeLists.txt new/mariadb-connector-c-2.3.3-src/CMakeLists.txt
--- old/mariadb-connector-c-2.3.2-src/CMakeLists.txt 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/CMakeLists.txt 2017-05-18 13:07:16.000000000 +0200
@@ -6,7 +6,7 @@
SET(CPACK_PACKAGE_VERSION_MAJOR 2)
SET(CPACK_PACKAGE_VERSION_MINOR 3)
-SET(CPACK_PACKAGE_VERSION_PATCH 2)
+SET(CPACK_PACKAGE_VERSION_PATCH 3)
SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
#Minimum required version is Cmake 2.8.8, since we need to build object libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/Makefile.am new/mariadb-connector-c-2.3.3-src/include/Makefile.am
--- old/mariadb-connector-c-2.3.2-src/include/Makefile.am 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-BUILT_SOURCES = mysql_version.h my_config.h
-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \
- mysqld_error.h my_list.h m_ctype.h \
- my_pthread.h my_no_pthread.h errmsg.h \
- my_global.h my_net.h \
- $(BUILT_SOURCES)
-noinst_HEADERS = config-win.h \
- my_dir.h mysys_err.h \
- my_alarm.h \
- hash.h thr_alarm.h \
- getopt.h violite.h \
- mysql_version.h.in
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/config-win.h new/mariadb-connector-c-2.3.3-src/include/config-win.h
--- old/mariadb-connector-c-2.3.2-src/include/config-win.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/config-win.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Defines for Win32 to make it compatible for MySQL */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/dbug.h new/mariadb-connector-c-2.3.3-src/include/dbug.h
--- old/mariadb-connector-c-2.3.2-src/include/dbug.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/dbug.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef _dbug_h
#define _dbug_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/errmsg.h new/mariadb-connector-c-2.3.3-src/include/errmsg.h
--- old/mariadb-connector-c-2.3.2-src/include/errmsg.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/errmsg.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Error messages for mysql clients */
/* error messages for the demon is in share/language/errmsg.sys */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/m_ctype.h new/mariadb-connector-c-2.3.3-src/include/m_ctype.h
--- old/mariadb-connector-c-2.3.2-src/include/m_ctype.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/m_ctype.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
A better inplementation of the UNIX ctype(3) library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/m_string.h new/mariadb-connector-c-2.3.3-src/include/m_string.h
--- old/mariadb-connector-c-2.3.2-src/include/m_string.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/m_string.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* There may be prolems include all of theese. Try to test in
configure with ones are needed? */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/ma_common.h new/mariadb-connector-c-2.3.3-src/include/ma_common.h
--- old/mariadb-connector-c-2.3.2-src/include/ma_common.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/ma_common.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* defines for the libmariadb library */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_alarm.h new/mariadb-connector-c-2.3.3-src/include/my_alarm.h
--- old/mariadb-connector-c-2.3.2-src/include/my_alarm.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_alarm.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
File to include when we want to use alarm or a loop_counter to display
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_base.h new/mariadb-connector-c-2.3.3-src/include/my_base.h
--- old/mariadb-connector-c-2.3.2-src/include/my_base.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_base.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* This file includes constants used with all databases */
/* Author: Michael Widenius */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_dir.h new/mariadb-connector-c-2.3.3-src/include/my_dir.h
--- old/mariadb-connector-c-2.3.2-src/include/my_dir.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_dir.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef _my_dir_h
#define _my_dir_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_global.h new/mariadb-connector-c-2.3.3-src/include/my_global.h
--- old/mariadb-connector-c-2.3.2-src/include/my_global.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_global.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* This is the main include file that should included 'first' in every
C file. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_list.h new/mariadb-connector-c-2.3.3-src/include/my_list.h
--- old/mariadb-connector-c-2.3.2-src/include/my_list.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_list.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef _list_h_
#define _list_h_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_net.h new/mariadb-connector-c-2.3.3-src/include/my_net.h
--- old/mariadb-connector-c-2.3.2-src/include/my_net.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_net.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* thread safe version of some common functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_no_pthread.h new/mariadb-connector-c-2.3.3-src/include/my_no_pthread.h
--- old/mariadb-connector-c-2.3.2-src/include/my_no_pthread.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_no_pthread.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
This undefs some pthread mutex locks when one isn't using threads
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_pthread.h new/mariadb-connector-c-2.3.3-src/include/my_pthread.h
--- old/mariadb-connector-c-2.3.2-src/include/my_pthread.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_pthread.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Defines to make different thread packages compatible */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_stmt.h new/mariadb-connector-c-2.3.3-src/include/my_stmt.h
--- old/mariadb-connector-c-2.3.2-src/include/my_stmt.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_stmt.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA
Part of this code includes code from PHP's mysqlnd extension
(written by Andrey Hristov, Georg Richter and Ulf Wendel), freely
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/my_sys.h new/mariadb-connector-c-2.3.3-src/include/my_sys.h
--- old/mariadb-connector-c-2.3.2-src/include/my_sys.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/my_sys.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef _my_sys_h
#define _my_sys_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/mysql/plugin_auth.h new/mariadb-connector-c-2.3.3-src/include/mysql/plugin_auth.h
--- old/mariadb-connector-c-2.3.2-src/include/mysql/plugin_auth.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/mysql/plugin_auth.h 2017-05-18 13:07:16.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/**
@file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/mysql/plugin_auth_common.h new/mariadb-connector-c-2.3.3-src/include/mysql/plugin_auth_common.h
--- old/mariadb-connector-c-2.3.2-src/include/mysql/plugin_auth_common.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/mysql/plugin_auth_common.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/mysql.h new/mariadb-connector-c-2.3.3-src/include/mysql.h
--- old/mariadb-connector-c-2.3.2-src/include/mysql.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/mysql.h 2017-05-18 13:07:16.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* defines for the libmariadb library */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/mysql_async.h new/mariadb-connector-c-2.3.3-src/include/mysql_async.h
--- old/mariadb-connector-c-2.3.2-src/include/mysql_async.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/mysql_async.h 2017-05-18 13:07:16.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Common definitions for MariaDB non-blocking client library. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/mysys_err.h new/mariadb-connector-c-2.3.3-src/include/mysys_err.h
--- old/mariadb-connector-c-2.3.2-src/include/mysys_err.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/mysys_err.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifndef _mysys_err_h
#define _mysys_err_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/thr_alarm.h new/mariadb-connector-c-2.3.3-src/include/thr_alarm.h
--- old/mariadb-connector-c-2.3.2-src/include/thr_alarm.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/thr_alarm.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Prototypes when using thr_alarm library functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/include/violite.h new/mariadb-connector-c-2.3.3-src/include/violite.h
--- old/mariadb-connector-c-2.3.2-src/include/violite.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/include/violite.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
* Vio Lite.
@@ -148,8 +148,8 @@
struct sockaddr_in local; /* Local internet address */
struct sockaddr_in remote; /* Remote internet address */
struct mysql_async_context *async_context; /* For non-blocking API */
- int write_timeout;
- int read_timeout;
+ unsigned int write_timeout;
+ unsigned int read_timeout;
enum enum_vio_type type; /* Type of connection */
char desc[30]; /* String description */
#ifdef HAVE_OPENSSL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/array.c new/mariadb-connector-c-2.3.3-src/libmariadb/array.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/array.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/array.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Handling of arrays that can grow dynamicly. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/bchange.c new/mariadb-connector-c-2.3.3-src/libmariadb/bchange.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/bchange.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/bchange.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : bchange.c
Author : Michael widenius
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/bmove.c new/mariadb-connector-c-2.3.3-src/libmariadb/bmove.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/bmove.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/bmove.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : bmove.c
Author : Richard A. O'Keefe.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/bmove_upp.c new/mariadb-connector-c-2.3.3-src/libmariadb/bmove_upp.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/bmove_upp.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/bmove_upp.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : bmove.c
Author : Michael widenius
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/charset.c new/mariadb-connector-c-2.3.3-src/libmariadb/charset.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/charset.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/charset.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/default.c new/mariadb-connector-c-2.3.3-src/libmariadb/default.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/default.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/default.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/****************************************************************************
** Add all options from files named "group".cnf from the default_directories
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/errmsg.c new/mariadb-connector-c-2.3.3-src/libmariadb/errmsg.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/errmsg.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/errmsg.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Error messages for MySQL clients */
/* error messages for the demon is in share/language/errmsg.sys */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/errors.c new/mariadb-connector-c-2.3.3-src/libmariadb/errors.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/errors.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/errors.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/int2str.c new/mariadb-connector-c-2.3.3-src/libmariadb/int2str.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/int2str.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/int2str.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Defines: int2str(), itoa(), ltoa()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/is_prefix.c new/mariadb-connector-c-2.3.3-src/libmariadb/is_prefix.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/is_prefix.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/is_prefix.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : is_prefix.c
Author : Michael Widenius
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/libmariadb.c new/mariadb-connector-c-2.3.3-src/libmariadb/libmariadb.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/libmariadb.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/libmariadb.c 2017-05-18 13:07:16.000000000 +0200
@@ -1845,9 +1845,6 @@
if (socket_block(sock, 1) == SOCKET_ERROR)
goto error;
}
- /* set timeouts */
- net->vio->read_timeout= mysql->options.read_timeout;
- net->vio->write_timeout= mysql->options.write_timeout;
if (mysql->options.extension && mysql->options.extension->async_context)
net->vio->async_context= mysql->options.extension->async_context;
@@ -1864,12 +1861,11 @@
/* set read timeout */
- if (mysql->options.read_timeout >= 0)
- vio_read_timeout(net->vio, mysql->options.read_timeout);
+ vio_read_timeout(net->vio, mysql->options.read_timeout);
/* set write timeout */
- if (mysql->options.write_timeout >= 0)
- vio_write_timeout(net->vio, mysql->options.read_timeout);
+ vio_write_timeout(net->vio, mysql->options.write_timeout);
+
/* Get version info */
mysql->protocol_version= PROTOCOL_VERSION; /* Assume this */
if (mysql->options.connect_timeout > 0 &&
@@ -3043,7 +3039,7 @@
mysql->options.charset_name=my_strdup((char *)arg1,MYF(MY_WME));
break;
case MYSQL_OPT_RECONNECT:
- mysql->reconnect= *(uint *)arg1;
+ mysql->reconnect= *(my_bool *)arg1;
break;
case MYSQL_OPT_PROTOCOL:
#ifdef _WIN32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/list.c new/mariadb-connector-c-2.3.3-src/libmariadb/list.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/list.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/list.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Code for handling dubble-linked lists in C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/llstr.c new/mariadb-connector-c-2.3.3-src/libmariadb/llstr.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/llstr.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/llstr.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Defines: llstr();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/longlong2str.c new/mariadb-connector-c-2.3.3-src/libmariadb/longlong2str.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/longlong2str.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/longlong2str.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Defines: longlong2str();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_dirname.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_dirname.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_dirname.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_dirname.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_fn_ext.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_fn_ext.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_fn_ext.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_fn_ext.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Returnerar en pekare till filnamnets extension. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_format.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_format.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_format.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_format.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_loadpath.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_loadpath.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_loadpath.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_loadpath.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_pack.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_pack.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_pack.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_pack.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_path.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_path.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_path.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_path.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_unixpath.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_unixpath.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_unixpath.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_unixpath.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mf_wcomp.c new/mariadb-connector-c-2.3.3-src/libmariadb/mf_wcomp.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mf_wcomp.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mf_wcomp.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Funktions for comparing with wild-cards */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mulalloc.c new/mariadb-connector-c-2.3.3-src/libmariadb/mulalloc.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mulalloc.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mulalloc.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Malloc many pointers at the same time */
/* format myFlags,ptr,length,ptr,length ... until null ptr */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_alloc.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_alloc.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_alloc.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_alloc.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Routines to handle mallocing of results which will be freed the same time */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_compress.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_compress.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_compress.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_compress.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Written by Sinisa Milivojevic */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_div.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_div.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_div.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_div.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_error.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_error.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_error.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_error.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_fopen.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_fopen.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_fopen.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_fopen.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "my_static.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_fstream.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_fstream.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_fstream.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_fstream.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* USE_MY_STREAM isn't set because we can't thrust my_fclose! */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_getwd.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_getwd.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_getwd.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_getwd.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* my_setwd() and my_getwd() works with intern_filenames !! */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_init.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_init.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_init.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_init.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "my_static.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_lib.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_lib.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_lib.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_lib.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* TODO: check for overun of memory for names. */
/* Convert MSDOS-TIME to standar time_t */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_malloc.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_malloc.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_malloc.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_malloc.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
#undef SAFEMALLOC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_messnc.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_messnc.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_messnc.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_messnc.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_net.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_net.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_net.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_net.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* thread safe version of some common functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_once.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_once.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_once.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_once.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Not MT-SAFE */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_open.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_open.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_open.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_open.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#define USES_TYPES
#include "mysys_priv.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_port.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_port.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_port.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_port.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Small functions to make code portable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_pthread.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_pthread.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_pthread.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_pthread.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Functions to get threads more portable */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_read.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_read.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_read.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_read.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_realloc.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_realloc.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_realloc.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_realloc.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
#undef SAFEMALLOC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_seek.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_seek.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_seek.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_seek.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_static.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_static.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_static.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_static.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Static variables for mysys library. All definied here for easy making of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_static.h new/mariadb-connector-c-2.3.3-src/libmariadb/my_static.h
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_static.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_static.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Static variables for mysys library. All definied here for easy making of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_stmt_codec.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_stmt_codec.c 2017-05-18 13:07:16.000000000 +0200
@@ -358,7 +358,7 @@
{
float fval;
fval= is_unsigned ? (float)(ulonglong)(val) : (float)val;
- float4store(r_param->buffer, fval);
+ float4store((float *)r_param->buffer, fval);
*r_param->error= is_unsigned ? (ulonglong)fval != (ulonglong)val : (longlong)fval != val;
r_param->buffer_length= 4;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_symlink.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_symlink.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_symlink.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_symlink.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_thr_init.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_thr_init.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_thr_init.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_thr_init.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
** Functions to handle initializating and allocationg of all mysys & debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_vsnprintf.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_vsnprintf.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_vsnprintf.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_vsnprintf.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/my_write.c new/mariadb-connector-c-2.3.3-src/libmariadb/my_write.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/my_write.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/my_write.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mysql_async.c new/mariadb-connector-c-2.3.3-src/libmariadb/mysql_async.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mysql_async.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mysql_async.c 2017-05-18 13:07:16.000000000 +0200
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
/*
MySQL non-blocking client library functions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/mysys_priv.h new/mariadb-connector-c-2.3.3-src/libmariadb/mysys_priv.h
--- old/mariadb-connector-c-2.3.2-src/libmariadb/mysys_priv.h 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/mysys_priv.h 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/net.c new/mariadb-connector-c-2.3.3-src/libmariadb/net.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/net.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/net.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Write and read of logical packets to/from socket
** Writes are cached into net_buffer_length big packets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/password.c new/mariadb-connector-c-2.3.3-src/libmariadb/password.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/password.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/password.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* password checking routines */
/*****************************************************************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/str2int.c new/mariadb-connector-c-2.3.3-src/libmariadb/str2int.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/str2int.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/str2int.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
str2int(src, radix, lower, upper, &val)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strcend.c new/mariadb-connector-c-2.3.3-src/libmariadb/strcend.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strcend.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strcend.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strcend.c
Author : Michael Widenius: ifdef MC68000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strcont.c new/mariadb-connector-c-2.3.3-src/libmariadb/strcont.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strcont.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strcont.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strcont.c
Author : Monty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strend.c new/mariadb-connector-c-2.3.3-src/libmariadb/strend.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strend.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strend.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strend.c
Author : Richard A. O'Keefe.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strfill.c new/mariadb-connector-c-2.3.3-src/libmariadb/strfill.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strfill.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strfill.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strfill.c
Author : Monty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/string.c new/mariadb-connector-c-2.3.3-src/libmariadb/string.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/string.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/string.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Code for handling strings with can grow dynamicly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strinstr.c new/mariadb-connector-c-2.3.3-src/libmariadb/strinstr.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strinstr.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strinstr.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strinstr.c
Author : Monty & David
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strmake.c new/mariadb-connector-c-2.3.3-src/libmariadb/strmake.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strmake.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strmake.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strmake.c
Author : Michael Widenius
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strmov.c new/mariadb-connector-c-2.3.3-src/libmariadb/strmov.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strmov.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strmov.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
strmov(dst, src) moves all the characters of src (including the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strnlen.c new/mariadb-connector-c-2.3.3-src/libmariadb/strnlen.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strnlen.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strnlen.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strnlen.c
Author : Michael Widenius
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strnmov.c new/mariadb-connector-c-2.3.3-src/libmariadb/strnmov.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strnmov.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strnmov.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
strnmov(dst,src,length) moves length characters, or until end, of src to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strto.c new/mariadb-connector-c-2.3.3-src/libmariadb/strto.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strto.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strto.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
strtol,strtoul,strtoll,strtoull
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strtoll.c new/mariadb-connector-c-2.3.3-src/libmariadb/strtoll.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strtoll.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strtoll.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* This is defines strtoll() if neaded */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strtoull.c new/mariadb-connector-c-2.3.3-src/libmariadb/strtoull.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strtoull.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strtoull.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* This is defines strtoull() */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/strxmov.c new/mariadb-connector-c-2.3.3-src/libmariadb/strxmov.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/strxmov.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/strxmov.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* File : strxmov.c
Author : Richard A. O'Keefe.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/thr_mutex.c new/mariadb-connector-c-2.3.3-src/libmariadb/thr_mutex.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/thr_mutex.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/thr_mutex.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* This makes a wrapper for mutex handling to make it easier to debug mutex */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/typelib.c new/mariadb-connector-c-2.3.3-src/libmariadb/typelib.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/typelib.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/typelib.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/* Functions to handle typelib */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/libmariadb/violite.c new/mariadb-connector-c-2.3.3-src/libmariadb/violite.c
--- old/mariadb-connector-c-2.3.2-src/libmariadb/violite.c 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/libmariadb/violite.c 2017-05-18 13:07:16.000000000 +0200
@@ -12,8 +12,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02111-1301, USA */
/*
Note that we can't have assertion on file descriptors; The reason for
@@ -127,13 +127,13 @@
void vio_read_timeout(Vio *vio, uint timeout)
{
- vio->read_timeout= (timeout > 0) ? timeout * 1000 : -1;
+ vio->read_timeout= timeout * 1000;
vio_timeout(vio, SO_RCVTIMEO, vio->read_timeout);
}
void vio_write_timeout(Vio *vio, uint timeout)
{
- vio->write_timeout= (timeout > 0) ? timeout * 1000 : -1;
+ vio->write_timeout= timeout * 1000;
vio_timeout(vio, SO_SNDTIMEO, vio->write_timeout);
}
@@ -248,7 +248,7 @@
do {
rc= poll(&p_fd, 1, timeout);
- } while (rc == -1 || errno == EINTR);
+ } while (rc == -1 && errno == EINTR);
if (rc == 0)
errno= ETIMEDOUT;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/mariadb_config/CMakeLists.txt new/mariadb-connector-c-2.3.3-src/mariadb_config/CMakeLists.txt
--- old/mariadb-connector-c-2.3.2-src/mariadb_config/CMakeLists.txt 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/mariadb_config/CMakeLists.txt 2017-05-18 13:07:16.000000000 +0200
@@ -28,7 +28,7 @@
${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
-TARGET_LINK_LIBRARIES(mariadb_config mariadbclient)
+TARGET_LINK_LIBRARIES(mariadb_config)
# Installation
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in new/mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in
--- old/mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in 2017-01-17 10:53:54.000000000 +0100
+++ new/mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in 2017-05-18 13:07:16.000000000 +0200
@@ -1,7 +1,6 @@
-#include
-#include
#include
#include
+#include
#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql"
#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \
@@ -39,6 +38,8 @@
PLUGIN_DIR
};
+const char *my_progname;
+
void usage(void)
{
int i=0;