@@ -79,7 +79,7 @@ if(jdbc_stand_alone)
79
79
)
80
80
81
81
add_config_option (BUNDLE_DEPENDENCIES BOOL ADVANCED DEFAULT OFF
82
- "copy dependencies to install location"
82
+ "copy dependencies to the install location"
83
83
)
84
84
85
85
endif (jdbc_stand_alone )
@@ -478,7 +478,7 @@ endif()
478
478
479
479
# additional client-side plugins (if any)
480
480
481
- set (PLUGINS )
481
+ set (PLUGINS mysql_native_password )
482
482
483
483
# additional bundled dependencies of the client library other than the openssl
484
484
# libraries that are handled separately (in DepFindSSL.cmake)
@@ -490,6 +490,33 @@ set(IGNORED_PLUGINS
490
490
# note: we have our own telemetry code, not using the client library plugin
491
491
telemetry_client
492
492
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
493
520
)
494
521
495
522
set (IGNORED_LIBS
@@ -651,11 +678,7 @@ macro(bundle_plugins ignored)
651
678
652
679
get_filename_component (lib_name ${lib} NAME_WE )
653
680
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}")
659
682
660
683
# Match plugin name against names in PLUGINS list and in case of match
661
684
# remove that name from the list
@@ -761,8 +784,10 @@ if(BUNDLE_DEPENDENCIES)
761
784
# add authentication plugins to the list of plugins
762
785
763
786
foreach (auth ${AUTH_PLUGINS} )
764
- set (plugin "authentication_${auth} " )
787
+ set (plugin "authentication_${auth} _client " )
765
788
list (APPEND PLUGINS ${plugin} )
789
+ # Note: ignore server-side plugin
790
+ list (APPEND IGNORED_PLUGINS "authentication_${auth} $" )
766
791
set (DEPS_${plugin} ${AUTH_DEPS_${auth}} )
767
792
list (APPEND IGNORED_LIBS ${DEPS_${plugin}} )
768
793
endforeach ()
0 commit comments