1
0
Ana Guerrero 2024-07-03 18:28:36 +00:00 committed by Git OBS Bridge
commit eeecd9cb00
7 changed files with 22 additions and 62 deletions

View File

@ -1,46 +0,0 @@
diff --git a/plugins/io/remote_io.c b/plugins/io/remote_io.c
index c06ecac..3deb144 100644
--- a/plugins/io/remote_io.c
+++ b/plugins/io/remote_io.c
@@ -279,11 +279,11 @@ MA_FILE *ma_rio_open(const char *url,const char *operation)
MA_REMOTE_FILE *rf;
(void)operation;
- if (!(file = (MA_FILE *)calloc(sizeof(MA_FILE), 1)))
+ if (!(file = (MA_FILE *)calloc(sizeof(MA_FILE) + 0, 1)))
return NULL;
file->type= MA_FILE_REMOTE;
- if (!(file->ptr= rf= (MA_REMOTE_FILE *)calloc(sizeof(MA_REMOTE_FILE), 1)))
+ if (!(file->ptr= rf= (MA_REMOTE_FILE *)calloc(sizeof(MA_REMOTE_FILE) + 0, 1)))
{
free(file);
return NULL;
diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c
index e1c31ea..7450acb 100644
--- a/unittest/libmariadb/bulk1.c
+++ b/unittest/libmariadb/bulk1.c
@@ -74,8 +74,8 @@ static int bulk1(MYSQL *mysql)
/* allocate memory */
buffer= calloc(TEST_ARRAY_SIZE, sizeof(char *));
- lengths= (unsigned long *)calloc(sizeof(long), TEST_ARRAY_SIZE);
- vals= (unsigned int *)calloc(sizeof(int), TEST_ARRAY_SIZE);
+ lengths= (unsigned long *)calloc(sizeof(long) + 0, TEST_ARRAY_SIZE);
+ vals= (unsigned int *)calloc(sizeof(int) + 0, TEST_ARRAY_SIZE);
for (i=0; i < TEST_ARRAY_SIZE; i++)
{
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index 804ef3e..39047df 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -5159,7 +5159,7 @@ static int test_maxparam(MYSQL *mysql)
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
MYSQL_BIND* bind;
- bind = calloc(sizeof(MYSQL_BIND), 65535);
+ bind = calloc(sizeof(MYSQL_BIND) + 0, 65535);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
check_mysql_rc(rc, mysql);

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb156c40147d375ba7ce85d554a67ce4080b2aeb523c6438030f6fe4d680378b
size 1393969

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEETEcP/+/E09xZd4ZVzho91ePJT0kFAmZwPa0ACgkQzho91ePJ
T0kLIwf/eixsxhFvklRq35s2ccuwqvsNavYlxZNKiKJWtVyknaXwHZGJrmoTcymK
GBixpbXFtVn2PUZ9LPVhmr8jPD7FUj6zKtUbBzf8VOHDAqYtgCf0SjjlQ0LBzGB/
1ljPvJ4A8+mmxqhJJlOXudAp32gIEFsKOF3fP7H6HI5bl+0nedbKIkRmD9AgMZ4O
p4IlEgM0A9TEishI0hK0F2L3hqsYdjUt9i0CLeEACct8OvTeOodz19aTC6apMoEq
d4Epq5PIlhE+qAK8fawK+WdwGhOjPYrC+tlaSXV/qvV4GL6dmioIDshSF4ECgeKQ
UBrefyyWPt7yr+2eo90V/UXkZerSow==
=k1BT
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
size 1393368

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEETEcP/+/E09xZd4ZVzho91ePJT0kFAmVmCesACgkQzho91ePJ
T0nhQwgA5UmFy0MV1IlyQu15eGpeChG9PNoXCdSZdD4iSCadc42o5lD/4RTLgIoU
qVd0NXdxgCZY2LnDzirYbmvK1AOmNUTkqy2fM3FtcLL8AFjbgBL1dC4MUIqwUujY
BIVw/dVTFD/xFYmlOxZLyJchFtd37Mja9Hugu0oJLP80b1RWCs9f1qwhCVigQLGH
UOKHaacKTE2WaICaUQnMiSlOLBHsdfQovBuEQM/C9R9U/Wxw9AdPIhcu9c6yYGAj
i8/5S4wiA5J7egGprDAABle9UdtILJaw6z4u34xsrrxLnMWOliYp1cJswW8S78C/
7KmXLBv//YLmWjSX+MpMEAAhqSdT+A==
=4d6v
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 27 14:43:28 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 3.3.10:
* https://mariadb.com/kb/en/mariadb-connector-c-3-3-10-release-notes/
- Remove fix-build-gcc14.patch (fixed upstream)
-------------------------------------------------------------------
Fri Mar 8 10:49:30 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>

View File

@ -25,7 +25,7 @@
%endif
%bcond_with sqlite3
Name: mariadb-connector-c
Version: 3.3.8
Version: 3.3.10
Release: 0
Summary: MariaDB connector in C
License: LGPL-2.1-or-later
@ -38,7 +38,6 @@ Source2: mariadb.keyring
Source3: baselibs.conf
Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch
Patch4: private_library.patch
Patch5: fix-build-gcc14.patch
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: pkgconfig