Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mariadb-connector-c for
openSUSE:Factory checked in at 2022-03-01 17:03:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb-connector-c (Old)
and /work/SRC/openSUSE:Factory/.mariadb-connector-c.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-c"
Tue Mar 1 17:03:06 2022 rev:36 rq:957993 version:3.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb-connector-c/mariadb-connector-c.changes
2021-11-23 22:12:01.002590929 +0100
+++
/work/SRC/openSUSE:Factory/.mariadb-connector-c.new.1958/mariadb-connector-c.changes
2022-03-01 17:03:13.556327999 +0100
@@ -1,0 +2,9 @@
+Thu Feb 24 14:05:48 UTC 2022 - Danilo Spinella <[email protected]>
+
+- Update to 3.2.6:
+ * release notes and changelog:
+ https://mariadb.com/kb/en/library/mariadb-connector-c-326-release-notes
+ https://mariadb.com/kb/en/library/mariadb-connector-c-326-changelog
+- Refresh private_library.patch
+
+-------------------------------------------------------------------
Old:
----
mariadb-connector-c-3.2.5-src.tar.gz
mariadb-connector-c-3.2.5-src.tar.gz.asc
New:
----
mariadb-connector-c-3.2.6-src.tar.gz
mariadb-connector-c-3.2.6-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-c.spec ++++++
--- /var/tmp/diff_new_pack.G6uOTi/_old 2022-03-01 17:03:14.368328214 +0100
+++ /var/tmp/diff_new_pack.G6uOTi/_new 2022-03-01 17:03:14.372328215 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mariadb-connector-c
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%endif
%bcond_with sqlite3
Name: mariadb-connector-c
-Version: 3.2.5
+Version: 3.2.6
Release: 0
Summary: MariaDB connector in C
License: LGPL-2.1-or-later
@@ -141,6 +141,7 @@
rm %{buildroot}%{_libdir}/libmariadbclient.a
rm %{buildroot}%{_libdir}/libmysqlclient.a
rm %{buildroot}%{_libdir}/libmysqlclient_r.a
+rm %{buildroot}%{_libdir}/libmariadb.a
# add a compatibility symlinks
ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
++++++ mariadb-connector-c-3.2.5-src.tar.gz ->
mariadb-connector-c-3.2.6-src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-c-3.2.5-src/CMakeLists.txt
new/mariadb-connector-c-3.2.6-src/CMakeLists.txt
--- old/mariadb-connector-c-3.2.5-src/CMakeLists.txt 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/CMakeLists.txt 2022-02-04
15:04:27.000000000 +0100
@@ -36,7 +36,7 @@
SET(CPACK_PACKAGE_VERSION_MAJOR 3)
SET(CPACK_PACKAGE_VERSION_MINOR 2)
-SET(CPACK_PACKAGE_VERSION_PATCH 5)
+SET(CPACK_PACKAGE_VERSION_PATCH 6)
SET(CPACK_PACKAGE_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 +
${CPACK_PACKAGE_VERSION_MINOR} * 100 +
@@ -72,7 +72,7 @@
IF(WITH_SIGNCODE)
IF(WIN32 AND NOT SIGN_OPTIONS)
- SET(SIGN_OPTIONS /a /t http://timestamp.verisign.com/scripts/timstamp.dll)
+ SET(SIGN_OPTIONS /tr http://timestamp.digicert.com /td sha256 /fd sha256
/a)
ELSE()
SEPARATE_ARGUMENTS(SIGN_OPTIONS)
ENDIF()
@@ -118,6 +118,11 @@
ENDFOREACH()
ENDIF()
ENDIF()
+ELSE()
+ # MDEV-16383
+ IF(WITH_EMBEDDED_SERVER)
+ ADD_DEFINITIONS(-DHAVE_EMBEDDED)
+ ENDIF()
ENDIF(NOT IS_SUBPROJECT)
# Disable dbug information for release builds
@@ -165,7 +170,7 @@
ELSE()
SET(MARIADB_CLIENT_VERSION_MAJOR "10")
SET(MARIADB_CLIENT_VERSION_MINOR "6")
- SET(MARIADB_CLIENT_VERSION_PATCH "5")
+ SET(MARIADB_CLIENT_VERSION_PATCH "6")
SET(MARIADB_CLIENT_VERSION_EXTRA "")
ENDIF()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mariadb-connector-c-3.2.5-src/include/mariadb_rpl.h
new/mariadb-connector-c-3.2.6-src/include/mariadb_rpl.h
--- old/mariadb-connector-c-3.2.5-src/include/mariadb_rpl.h 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/include/mariadb_rpl.h 2022-02-04
15:04:27.000000000 +0100
@@ -245,6 +245,8 @@
char *column_update_bitmap;
size_t row_data_size;
void *row_data;
+ size_t extra_data_size;
+ void *extra_data;
};
struct st_mariadb_rpl_heartbeat_event {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/libmariadb/CMakeLists.txt
new/mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt
--- old/mariadb-connector-c-3.2.5-src/libmariadb/CMakeLists.txt 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt 2022-02-04
15:04:27.000000000 +0100
@@ -448,6 +448,7 @@
ENDIF()
ENDIF()
+create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient
${INSTALL_LIBDIR})
SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
${CPACK_PACKAGE_VERSION_MAJOR}
@@ -460,10 +461,14 @@
INSTALL(TARGETS mariadbclient
COMPONENT Development
DESTINATION ${INSTALL_LIBDIR})
-INSTALL(TARGETS libmariadb
- COMPONENT SharedLibraries
- DESTINATION ${INSTALL_LIBDIR})
-
+# in cmake 3.12+ we can use
+#INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+# COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
+# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use
+INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ COMPONENT SharedLibraries NAMELINK_SKIP)
+INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ COMPONENT Development NAMELINK_ONLY)
IF(MSVC)
# On Windows, install PDB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_lib.c
new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_lib.c
--- old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_lib.c 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_lib.c 2022-02-04
15:04:27.000000000 +0100
@@ -1563,6 +1563,7 @@
SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0);
goto error;
}
+ is_maria= mariadb_connection(mysql);
}
end+= strlen(end) + 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_rpl.c
new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_rpl.c
--- old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_rpl.c 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_rpl.c 2022-02-04
15:04:27.000000000 +0100
@@ -348,9 +348,19 @@
break;
}
case WRITE_ROWS_EVENT_V1:
+ case WRITE_ROWS_EVENT:
case UPDATE_ROWS_EVENT_V1:
+ case UPDATE_ROWS_EVENT:
case DELETE_ROWS_EVENT_V1:
- rpl_event->event.rows.type= rpl_event->event_type - WRITE_ROWS_EVENT_V1;
+ case DELETE_ROWS_EVENT:
+ if (rpl_event->event_type >= WRITE_ROWS_EVENT)
+ {
+ rpl_event->event.rows.type= rpl_event->event_type - WRITE_ROWS_EVENT;
+ }
+ else
+ {
+ rpl_event->event.rows.type= rpl_event->event_type -
WRITE_ROWS_EVENT_V1;
+ }
if (rpl->fd_header_len == 6)
{
rpl_event->event.rows.table_id= uint4korr(ev);
@@ -361,6 +371,25 @@
}
rpl_event->event.rows.flags= uint2korr(ev);
ev+= 2;
+ /* ROWS_EVENT V2 has the extra-data field.
+ See also: https://dev.mysql.com/doc/internals/en/rows-event.html
+ */
+ if (rpl_event->event_type >= WRITE_ROWS_EVENT)
+ {
+ rpl_event->event.rows.extra_data_size= uint2korr(ev) - 2;
+ ev+= 2;
+ if (rpl_event->event.rows.extra_data_size > 0)
+ {
+ if (!(rpl_event->event.rows.extra_data =
+ (char *)ma_alloc_root(&rpl_event->memroot,
+ rpl_event->event.rows.extra_data_size)))
+ goto mem_error;
+ memcpy(rpl_event->event.rows.extra_data,
+ ev,
+ rpl_event->event.rows.extra_data_size);
+ ev+= rpl_event->event.rows.extra_data_size;
+ }
+ }
len= rpl_event->event.rows.column_count= mysql_net_field_length(&ev);
if (!len)
break;
@@ -369,7 +398,8 @@
goto mem_error;
memcpy(rpl_event->event.rows.column_bitmap, ev, (len + 7) / 8);
ev+= (len + 7) / 8;
- if (rpl_event->event_type == UPDATE_ROWS_EVENT_V1)
+ if (rpl_event->event_type == UPDATE_ROWS_EVENT_V1 ||
+ rpl_event->event_type == UPDATE_ROWS_EVENT)
{
if (!(rpl_event->event.rows.column_update_bitmap =
(char *)ma_alloc_root(&rpl_event->memroot, (len + 7) / 8)))
@@ -382,19 +412,19 @@
{
if (!(rpl_event->event.rows.row_data =
(char *)ma_alloc_root(&rpl_event->memroot,
rpl_event->event.rows.row_data_size)))
- goto mem_error;
+ goto mem_error;
memcpy(rpl_event->event.rows.row_data, ev,
rpl_event->event.rows.row_data_size);
}
break;
default:
- free(rpl_event);
+ mariadb_free_rpl_event(rpl_event);
return NULL;
break;
}
return rpl_event;
}
mem_error:
- free(rpl_event);
+ mariadb_free_rpl_event(rpl_event);
SET_CLIENT_ERROR(rpl->mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0);
return 0;
}
@@ -410,8 +440,8 @@
}
int mariadb_rpl_optionsv(MARIADB_RPL *rpl,
- enum mariadb_rpl_option option,
- ...)
+ enum mariadb_rpl_option option,
+ ...)
{
va_list ap;
int rc= 0;
@@ -465,8 +495,8 @@
}
int mariadb_rpl_get_optionsv(MARIADB_RPL *rpl,
- enum mariadb_rpl_option option,
- ...)
+ enum mariadb_rpl_option option,
+ ...)
{
va_list ap;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_stmt.c
new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_stmt.c
--- old/mariadb-connector-c-3.2.5-src/libmariadb/mariadb_stmt.c 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/libmariadb/mariadb_stmt.c 2022-02-04
15:04:27.000000000 +0100
@@ -812,6 +812,16 @@
size+= 9; /* max 8 bytes for size */
size+= (size_t)ma_get_length(stmt, i, 0);
break;
+ case MYSQL_TYPE_TIME:
+ size+= MAX_TIME_STR_LEN;
+ break;
+ case MYSQL_TYPE_DATE:
+ size+= MAX_DATE_STR_LEN;
+ break;
+ case MYSQL_TYPE_DATETIME:
+ case MYSQL_TYPE_TIMESTAMP:
+ size+= MAX_DATETIME_STR_LEN;
+ break;
default:
size+=
mysql_ps_fetch_functions[stmt->params[i].buffer_type].pack_len;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/mariadb_config/CMakeLists.txt
new/mariadb-connector-c-3.2.6-src/mariadb_config/CMakeLists.txt
--- old/mariadb-connector-c-3.2.5-src/mariadb_config/CMakeLists.txt
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/mariadb_config/CMakeLists.txt
2022-02-04 15:04:27.000000000 +0100
@@ -59,7 +59,7 @@
# Installation
#
INSTALL(TARGETS mariadb_config
- DESTINATION "bin"
+ DESTINATION "${INSTALL_BINDIR}"
COMPONENT Development)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/mariadb_config/mariadb_config.c.in
new/mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
--- old/mariadb-connector-c-3.2.5-src/mariadb_config/mariadb_config.c.in
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
2022-02-04 15:04:27.000000000 +0100
@@ -3,6 +3,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <mariadb_version.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
@@ -45,6 +48,10 @@
#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"
#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"
+#ifdef HAVE_EMBEDDED
+#define EMBEDDED_LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadbd
@extra_dynamic_LDFLAGS@"
+#endif
+
#if defined(SOLARIS) || defined(__sun)
#define OPT_STRING_TYPE (char *)
#else
@@ -65,6 +72,11 @@
{OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'},
{OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'},
{OPT_STRING_TYPE "variable", 2, 0, 'm'},
+#ifdef HAVE_EMBEDDED
+ {OPT_STRING_TYPE "libmysqld-libs", no_argument, 0, 'n' },
+ {OPT_STRING_TYPE "embedded-libs", no_argument, 0, 'n' },
+ {OPT_STRING_TYPE "embedded", no_argument, 0, 'n' },
+#endif
{NULL, 0, 0, 0}
};
@@ -95,6 +107,9 @@
PLUGIN_DIR,
TLS_LIBRARY_VERSION,
"VAR VAR is one of:"
+#ifdef HAVE_EMBEDDED
+ ,EMBEDDED_LIBS
+#endif
};
void usage(void)
@@ -232,7 +247,7 @@
while(1)
{
int option_index= 0;
- c= getopt_long(argc, argv, "abcdefghijkl", long_options, &option_index);
+ c= getopt_long(argc, argv, "abcdefghijklmno", long_options, &option_index);
switch(c) {
case 'a': /* CFLAGS and Include directories */
@@ -288,6 +303,11 @@
}
break;
}
+#ifdef HAVE_EMBEDDED
+ case 'n':
+ puts(EMBEDDED_LIBS);
+ break;
+#endif
default:
exit((c != -1));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/CMakeLists.txt
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/CMakeLists.txt
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/CMakeLists.txt
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/CMakeLists.txt
2022-02-04 15:04:27.000000000 +0100
@@ -26,7 +26,7 @@
${CC_SOURCE_DIR}/unittest/libmariadb)
ADD_DEFINITIONS(-DLIBMARIADB)
-SET(API_TESTS "conc336" "bulk1" "performance" "basic-t" "fetch" "charset"
"logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection"
"misc" "ps_new" "thread" "features-10_2" "bulk1")
+SET(API_TESTS "conc336" "bulk1" "performance" "basic-t" "fetch" "charset"
"logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection"
"misc" "ps_new" "thread" "features-10_2")
IF(WITH_DYNCOL)
SET(API_TESTS ${API_TESTS} "dyncol")
ENDIF()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/connection.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/connection.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/connection.c
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/connection.c
2022-02-04 15:04:27.000000000 +0100
@@ -880,7 +880,7 @@
const char *attr_val[] = {"bar1", "bar2", "bar3"};
char **key, **val;
- for (i=0; options_int[i]; i++)
+ for (i=0; i < (int)(sizeof(options_int)/sizeof(int)); i++)
{
mysql_options(mysql, options_int[i], &intval[0]);
intval[1]= 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/misc.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/misc.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/misc.c
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/misc.c
2022-02-04 15:04:27.000000000 +0100
@@ -293,7 +293,7 @@
rc= 0;
while (mysql_fetch_row(result))
rc++;
- FAIL_UNLESS(rc == 1, "rowcount != 0");
+ FAIL_UNLESS(rc == 1, "rowcount != 1");
mysql_data_seek(result, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps.c 2021-11-03
16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps.c 2022-02-04
15:04:27.000000000 +0100
@@ -139,9 +139,6 @@
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
check_mysql_rc(rc, mysql);
- rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
- check_mysql_rc(rc, mysql);
-
for (cur_query= testcase; *cur_query; cur_query++)
{
char query[MAX_TEST_QUERY_LENGTH];
@@ -183,7 +180,7 @@
static int test_bind_date_conv(MYSQL *mysql, uint row_count)
{
MYSQL_STMT *stmt= 0;
- uint rc, i, count= row_count;
+ uint rc, i, count;
MYSQL_BIND my_bind[4];
my_bool is_null[4]= {0,0,0,0};
MYSQL_TIME tm[4];
@@ -1020,7 +1017,7 @@
strcpy(query, "show columns from test_show");
stmt= mysql_stmt_init(mysql);
- FAIL_IF(!stmt, mysql_error(mysql));
+ FAIL_IF(!stmt, mysql_stmt_error(stmt));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
@@ -3004,7 +3001,7 @@
check_stmt_rc(rc, stmt_drop);
rc= mysql_stmt_execute(stmt_create_select);
- check_stmt_rc(rc, stmt_create);
+ check_stmt_rc(rc, stmt_create_select);
rc= mysql_stmt_execute(stmt_select);
check_stmt_rc(rc, stmt_select);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps_bugs.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps_bugs.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps_bugs.c
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps_bugs.c
2022-02-04 15:04:27.000000000 +0100
@@ -449,7 +449,7 @@
/* expected error */
rc = mysql_stmt_fetch(stmt);
- FAIL_UNLESS(rc==1, "Error expedted");
+ FAIL_UNLESS(rc==1, "Error expected");
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -543,7 +543,7 @@
check_mysql_rc(rc, mysql);
rc= mysql_stmt_close(stmt);
- check_mysql_rc(rc, mysql);
+ check_stmt_rc(rc, stmt);
return OK;
}
@@ -726,7 +726,7 @@
succeeds
*/
rc= mysql_stmt_prepare(stmt, "SHOW STATUS", 12);
- FAIL_UNLESS(!rc || mysql_stmt_errno(stmt) || mysql_errno(mysql), "Error
expected");
+ FAIL_UNLESS(!rc || mysql_stmt_errno(stmt) || mysql_errno(mysql), "Error not
expected");
rc= mysql_stmt_close(stmt);
check_mysql_rc(rc, mysql);
@@ -789,7 +789,7 @@
metadata= mysql_stmt_result_metadata(stmt);
field= mysql_fetch_fields(metadata);
FAIL_UNLESS(field[0].length == 65535, "length != 65535");
- FAIL_UNLESS(field[1].length == 255, "length != 244");
+ FAIL_UNLESS(field[1].length == 255, "length != 255");
FAIL_UNLESS(field[2].length == 16777215, "length != 166777215");
FAIL_UNLESS(field[3].length == 4294967295UL, "length != 4294967295UL");
FAIL_UNLESS(field[4].length == 255, "length != 255");
@@ -4322,7 +4322,7 @@
check_stmt_rc(rc, stmt);
rc= mysql_stmt_close(stmt);
- check_mysql_rc(rc, mysql);
+ check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "SELECT row_count()");
result= mysql_store_result(mysql);
@@ -4530,8 +4530,8 @@
FAIL_IF(length[2] != 4, "Wrong fetched int length");
FAIL_IF(strncmp(data, "data2", length[0] + 1) != 0, "Wrong string value");
- FAIL_IF(smint_col != -25734, "Expected 21893");
- FAIL_IF(int_col != -1857802040, "Expected 1718038908");
+ FAIL_IF(smint_col != -25734, "Expected -25734");
+ FAIL_IF(int_col != -1857802040, "Expected -1857802040");
rc= mysql_stmt_fetch(stmt);
FAIL_IF(rc != MYSQL_NO_DATA, "Expected MYSQL_NO_DATA");
@@ -4843,9 +4843,6 @@
{"SELECT '00:60:00'",
{0,0,0, 0,0,0, 0,0, MYSQL_TIMESTAMP_ERROR},
},
- {"SELECT '00:60:00'",
- {0,0,0, 0,0,0, 0,0, MYSQL_TIMESTAMP_ERROR},
- },
{"SELECT '839:00:00'",
{0,0,0, 0,0,0, 0,0, MYSQL_TIMESTAMP_ERROR},
},
@@ -4987,8 +4984,8 @@
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
+ rc = mysql_stmt_store_result(stmt);
check_stmt_rc(rc, stmt);
- rc= mysql_stmt_store_result(stmt);
memset(bind, 0, sizeof(MYSQL_BIND));
bind[0].buffer_type= MYSQL_TYPE_DATETIME;
@@ -5004,9 +5001,11 @@
expected= i > 6 ? 123456 : frac * (unsigned int)powl(10, (6 - i));
- diag("tm.second_part=%ld expected=%ld", tm.second_part, expected);
- FAIL_IF(tm.second_part != expected, "expected fractional part to be
900000");
-
+ if (tm.second_part != expected)
+ {
+ diag("Error: tm.second_part=%ld expected=%ld", tm.second_part, expected);
+ return FAIL;
+ }
}
mysql_stmt_close(stmt);
return OK;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps_new.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps_new.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/ps_new.c
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/ps_new.c
2022-02-04 15:04:27.000000000 +0100
@@ -120,7 +120,7 @@
rc= mysql_stmt_fetch(stmt);
FAIL_IF(mysql_stmt_field_count(stmt) != 2, "expected 2 fields");
FAIL_IF(int_data[0] != 200 || int_data[1] != 300,
- "expected 100 200 300");
+ "expected 200 300");
FAIL_IF(mysql_stmt_next_result(stmt) != 0, "expected more results");
FAIL_IF(mysql_stmt_field_count(stmt) != 0, "expected 0 fields");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/t_conc173.c
new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/t_conc173.c
--- old/mariadb-connector-c-3.2.5-src/unittest/libmariadb/t_conc173.c
2021-11-03 16:35:27.000000000 +0100
+++ new/mariadb-connector-c-3.2.6-src/unittest/libmariadb/t_conc173.c
2022-02-04 15:04:27.000000000 +0100
@@ -31,9 +31,9 @@
{
MYSQL mysql;
int arg;
- int i=0;
+ int i;
- for (;;)
+ for (i = 0; i < 1000; i++)
{
mysql_init(&mysql);
mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
++++++ private_library.patch ++++++
--- /var/tmp/diff_new_pack.G6uOTi/_old 2022-03-01 17:03:14.612328279 +0100
+++ /var/tmp/diff_new_pack.G6uOTi/_new 2022-03-01 17:03:14.616328280 +0100
@@ -8,11 +8,11 @@
exports all symbols. With the exception of exported symbols, it is
identical to the regular library.
-Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt
===================================================================
---- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
-@@ -414,6 +414,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE
${SYSTEM_LIBS})
+--- mariadb-connector-c-3.2.6-src.orig/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.2.6-src/libmariadb/CMakeLists.txt
+@@ -416,6 +416,12 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PR
SIGN_TARGET(libmariadb)
@@ -25,7 +25,7 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
CMAKE_SYSTEM_NAME MATCHES "GNU")
-@@ -421,11 +427,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
+@@ -423,11 +429,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined")
ENDIF()
SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS
"${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
@@ -39,22 +39,21 @@
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
#
-@@ -461,7 +469,9 @@ INSTALL(TARGETS mariadbclient
- INSTALL(TARGETS libmariadb
- COMPONENT SharedLibraries
- DESTINATION ${INSTALL_LIBDIR})
--
+@@ -469,6 +477,9 @@ INSTALL(TARGETS libmariadb LIBRARY DESTI
+ COMPONENT SharedLibraries NAMELINK_SKIP)
+ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ COMPONENT Development NAMELINK_ONLY)
+INSTALL(TARGETS libmariadbprivate
-+ COMPONENT SharedLibraries
-+ DESTINATION ${INSTALL_LIBDIR})
++ COMPONENT SharedLibraries
++ DESTINATION ${INSTALL_LIBDIR})
IF(MSVC)
# On Windows, install PDB
-Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
===================================================================
---- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
-@@ -30,6 +30,7 @@ static char *mariadb_progname;
+--- mariadb-connector-c-3.2.6-src.orig/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.2.6-src/mariadb_config/mariadb_config.c.in
+@@ -33,6 +33,7 @@ static char *mariadb_progname;
#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
@@ -62,15 +61,15 @@
#define CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
-@@ -65,6 +66,7 @@ static struct option long_options[]=
+@@ -72,6 +73,7 @@ static struct option long_options[]=
{OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'},
{OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'},
{OPT_STRING_TYPE "variable", 2, 0, 'm'},
+ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'z'},
- {NULL, 0, 0, 0}
- };
-
-@@ -92,6 +94,7 @@ static const char *values[]=
+ #ifdef HAVE_EMBEDDED
+ {OPT_STRING_TYPE "libmysqld-libs", no_argument, 0, 'n' },
+ {OPT_STRING_TYPE "embedded-libs", no_argument, 0, 'n' },
+@@ -104,6 +106,7 @@ static const char *values[]=
CC_VERSION,
SOCKET,
PORT,
@@ -78,14 +77,14 @@
PLUGIN_DIR,
TLS_LIBRARY_VERSION,
"VAR VAR is one of:"
-@@ -288,6 +291,9 @@ int main(int argc, char **argv)
+@@ -303,6 +306,9 @@ int main(int argc, char **argv)
}
break;
}
+ case 'z':
+ puts(PRIVATE_LIBS);
+ break;
- default:
- exit((c != -1));
- }
+ #ifdef HAVE_EMBEDDED
+ case 'n':
+ puts(EMBEDDED_LIBS);
