Skip to content

Commit eba03c6

Browse files
committed
Bug#36730565 JDBC: mysql_native_password plugin not bundled with the connector
Also make the check for bundled plugins more sensitive so that it should catch such issue next time.
1 parent 7e2f9c5 commit eba03c6

File tree

1 file changed

+33
-8
lines changed

1 file changed

+33
-8
lines changed

jdbc/CMakeLists.txt

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if(jdbc_stand_alone)
7979
)
8080

8181
add_config_option(BUNDLE_DEPENDENCIES BOOL ADVANCED DEFAULT OFF
82-
"copy dependencies to install location"
82+
"copy dependencies to the install location"
8383
)
8484

8585
endif(jdbc_stand_alone)
@@ -478,7 +478,7 @@ endif()
478478

479479
# additional client-side plugins (if any)
480480

481-
set(PLUGINS)
481+
set(PLUGINS mysql_native_password)
482482

483483
# additional bundled dependencies of the client library other than the openssl
484484
# libraries that are handled separately (in DepFindSSL.cmake)
@@ -490,6 +490,33 @@ set(IGNORED_PLUGINS
490490
# note: we have our own telemetry code, not using the client library plugin
491491
telemetry_client
492492
authentication_fido_client # note: replaced by webauthn plugin
493+
# server-side plugins, starting with authentication ones
494+
auth$ auth_socket
495+
authentication_ldap_simple$ authentication_pam$ authentication_windows$
496+
component_
497+
libtest_
498+
keyring_
499+
semisync_
500+
adt_null
501+
audit_log
502+
conflicting_variables
503+
connection_control
504+
data_masking
505+
firewall
506+
locking_service
507+
mypluglib
508+
mysql_clone
509+
mysql_no_login
510+
thread_pool
511+
validate_password
512+
version_token
513+
ha_
514+
qa_
515+
.*replication
516+
.*rewrite
517+
.*example
518+
.*test
519+
.*mecab
493520
)
494521

495522
set(IGNORED_LIBS
@@ -651,11 +678,7 @@ macro(bundle_plugins ignored)
651678

652679
get_filename_component(lib_name ${lib} NAME_WE)
653680

654-
if(NOT lib_name MATCHES "_client")
655-
continue()
656-
endif()
657-
658-
#message("== looking at client-side plugin: ${lib_name}")
681+
#message("== looking at plugin: ${lib_name}")
659682

660683
# Match plugin name against names in PLUGINS list and in case of match
661684
# remove that name from the list
@@ -761,8 +784,10 @@ if(BUNDLE_DEPENDENCIES)
761784
# add authentication plugins to the list of plugins
762785

763786
foreach(auth ${AUTH_PLUGINS})
764-
set(plugin "authentication_${auth}")
787+
set(plugin "authentication_${auth}_client")
765788
list(APPEND PLUGINS ${plugin})
789+
# Note: ignore server-side plugin
790+
list(APPEND IGNORED_PLUGINS "authentication_${auth}$")
766791
set(DEPS_${plugin} ${AUTH_DEPS_${auth}})
767792
list(APPEND IGNORED_LIBS ${DEPS_${plugin}})
768793
endforeach()

0 commit comments

Comments
 (0)