Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MariaDB Connector to Version 3.3.8 #4407

Merged
merged 45 commits into from
Jan 9, 2024
Merged

Update MariaDB Connector to Version 3.3.8 #4407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7c36085
Added mariadb-connector-c-3.3.8
rahim-kanji Dec 13, 2023
48d3d8e
Updated plugin_auth_CMakeLists.txt patch
rahim-kanji Dec 13, 2023
a8e00bd
Removed ConnectorName.patch
rahim-kanji Dec 18, 2023
be0e4b1
Updated ma_context.h.patch
rahim-kanji Dec 18, 2023
e9b3956
Updated mariadb_stmt.c.patch
rahim-kanji Dec 19, 2023
7e202c9
Updated mariadb_lib.c.patch
rahim-kanji Dec 19, 2023
7ab8759
Updated mariadb_lib.c.collation.patch
rahim-kanji Dec 19, 2023
d4c7832
Updated mariadb_lib.c.ipv6_fix.patch
rahim-kanji Dec 19, 2023
661fba5
Updated mariadb_async.c.patch
rahim-kanji Dec 20, 2023
f0589f0
Updated ma_password.c.patch
rahim-kanji Dec 20, 2023
29da460
Updated mysql.h.patch
rahim-kanji Dec 20, 2023
cd3ba0a
Updated ma_priv.h.patch
rahim-kanji Dec 20, 2023
d055ace
Updated ma_alloc.c.patch
rahim-kanji Dec 20, 2023
25a65f2
Updated ma_charset.c.patch
rahim-kanji Dec 20, 2023
ace0fda
Updated unittest_basic-t.c.patch
rahim-kanji Dec 21, 2023
b1ac8bb
Updated unittest_charset.c.patch
rahim-kanji Dec 21, 2023
e70d23b
Updated mariadb_asan.patch
rahim-kanji Dec 21, 2023
7e047b5
Updated mariadb_dyncol.c-multiplication-overflow.patch
rahim-kanji Dec 21, 2023
2473383
Updated ma_array.c-multiplication-overflow.patch
rahim-kanji Dec 21, 2023
b7eaa5e
Updated zutil.c-multiplication-overflow.patch
rahim-kanji Dec 21, 2023
445e99c
Updated cr_new_stmt_metadata_removal.patch
rahim-kanji Dec 21, 2023
f181128
Updated ps_buffer_stmt_read_all_rows.patch
rahim-kanji Dec 21, 2023
3158ff1
Updated mariadb_stmt_store_result_err.patch
rahim-kanji Dec 21, 2023
7ed3293
Updated empty_split_compress_packet.patch
rahim-kanji Dec 21, 2023
e6122be
Updated sslkeylogfile.patch
rahim-kanji Dec 21, 2023
4973cc4
Fixed compilation error
rahim-kanji Dec 24, 2023
18ff61e
Fixed unreferenced variable warning
rahim-kanji Dec 24, 2023
1e42720
Updated client_deprecate_eof.patch
rahim-kanji Dec 26, 2023
d1484bc
Updated mariadb_com.h.patch
rahim-kanji Dec 26, 2023
9edb69c
Updated ma_charset.c.patch
rahim-kanji Dec 26, 2023
a233795
Removed old sslkeylogfile patches
rahim-kanji Dec 27, 2023
d915f1e
Updated mariadb_com.h.patch
rahim-kanji Dec 27, 2023
7ede266
Updated x509cache.patch
rahim-kanji Dec 27, 2023
9ac7aa0
Updated mariadb_rpl.patch
rahim-kanji Dec 27, 2023
30d51e6
Fixed warnings
rahim-kanji Dec 27, 2023
0b40825
Updated mariadb_client link
rahim-kanji Dec 27, 2023
0267ee4
Removed mariadb-connector-c-3.1.9-src.tar.gz
rahim-kanji Dec 27, 2023
91fda88
Merge branch 'v2.x' into v2.x_update_mariadb_connector_to_3.3.8
rahim-kanji Dec 27, 2023
6b4fd99
Replaced [[maybe_unused]] with __attribute__((unused))
rahim-kanji Dec 27, 2023
465ff35
Few fixes
rahim-kanji Dec 28, 2023
7cd7027
Added error checking
rahim-kanji Dec 29, 2023
a9047c6
Updated x509cache.patch
rahim-kanji Dec 29, 2023
e822084
Few fixes
rahim-kanji Dec 29, 2023
6b76ceb
removed treat warning as error flag
rahim-kanji Jan 1, 2024
4e69e9b
Added query rule to route 'SELECT @rpl_semi_sync_slave=?' and 'SET @r…
rahim-kanji Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 31 additions & 37 deletions deps/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,53 +193,47 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a

mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/openssl/libssl.a
cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.1.9-src.tar.gz
cd mariadb-client-library/mariadb_client && patch ./plugins/auth/CMakeLists.txt < ../plugin_auth_CMakeLists.txt.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ConnectorName.patch
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
ifeq ($(PROXYDEBUG),1)
cd mariadb-client-library/mariadb_client && patch include/ma_context.h < ../ma_context.h.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
else ifeq ($(USEVALGRIND),1)
cd mariadb-client-library/mariadb_client && patch include/ma_context.h < ../ma_context.h.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
endif
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_stmt.c < ../mariadb_stmt.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.collation.patch # make sure this path is applied after mariadb_lib.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.ipv6_fix.patch # make sure this patch is applied after mariadb_lib.c.collation.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.collation.patch # make sure this path is applied after mariadb_lib.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.ipv6_fix.patch # make sure this patch is applied after mariadb_lib.c.collation.patch
# cd mariadb-client-library/mariadb_client && patch libmariadb/net.c < ../net.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_async.c < ../mariadb_async.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_password.c < ../ma_password.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_async.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_password.c.patch
# cd mariadb-client-library/mariadb_client && patch libmariadb/ma_secure.c < ../ma_secure.c.patch
cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.patch
cd mariadb-client-library/mariadb_client && patch include/mariadb_com.h < ../mariadb_com.h.patch
cd mariadb-client-library/mariadb_client && patch include/ma_priv.h < ../ma_priv.h.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_alloc.c < ../ma_alloc.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_charset.c < ../ma_charset.c.patch
# cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch
cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/basic-t.c < ../unittest_basic-t.c.patch
cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/charset.c < ../unittest_charset.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../client_deprecate_eof.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../cr_new_stmt_metadata_removal.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ps_buffer_stmt_read_all_rows.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../empty_split_compress_packet.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt_store_result_err.patch

cd mariadb-client-library/mariadb_client && patch -p0 < ../mysql.h.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_priv.h.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_alloc.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_charset.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../unittest_basic-t.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../unittest_charset.c.patch
ifeq ($(WITHASAN),1)
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_asan.patch
endif
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_dyncol.c < ../mariadb_dyncol.c-multiplication-overflow.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_array.c < ../ma_array.c-multiplication-overflow.patch
cd mariadb-client-library/mariadb_client && patch zlib/zutil.c < ../zutil.c-multiplication-overflow.patch
# patches for replication testing
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_rpl.c < ../mariadb_rpl.c.patch
cd mariadb-client-library/mariadb_client && patch include/mariadb_rpl.h < ../mariadb_rpl.h.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_dyncol.c-multiplication-overflow.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_array.c-multiplication-overflow.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../zutil.c-multiplication-overflow.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../cr_new_stmt_metadata_removal.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ps_buffer_stmt_read_all_rows.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt_store_result_err.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../empty_split_compress_packet.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../sslkeylogfile.patch
#cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../client_deprecate_eof.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_com.h.patch
# patches for x509 cache . See https://github.com/sysown/proxysql/issues/4117 (Slow connection time with SSL and large CA file , relevant on Aurora)
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.x509cache.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/secure/openssl.c < ../openssl.c.x509cache.patch
cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.sslkeylogfile.patch
cd mariadb-client-library/mariadb_client && patch include/ma_common.h < ../ma_common.h.sslkeylogfile.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.sslkeylogfile.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/secure/openssl.c < ../openssl.c.sslkeylogfile.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../x509cache.patch
# patches for replication testing
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_rpl.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../cmakelists.txt.patch
cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient
# cd mariadb-client-library/mariadb_client/include && make my_config.h

Expand Down
13 changes: 0 additions & 13 deletions deps/mariadb-client-library/ConnectorName.patch
View file
Open in desktop

This file was deleted.

Loading
Loading