@@ -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 )
@@ -477,6 +477,13 @@ endif()
477
477
478
478
479
479
# additional client-side plugins (if any)
480
+ #
481
+ # FIXME: The standard build of the client library uses mysql_native_password
482
+ # plugin to implement native password authentication. We should bundle that
483
+ # plugin if it is present. But currently we build connector with a modified
484
+ # client library that has the plugin built-in and does not ship it as a separate
485
+ # module. Therefore we can't specify it here because the plugins check would
486
+ # complain about missing plugin.
480
487
481
488
set (PLUGINS )
482
489
@@ -490,6 +497,33 @@ set(IGNORED_PLUGINS
490
497
# note: we have our own telemetry code, not using the client library plugin
491
498
telemetry_client
492
499
authentication_fido_client # note: replaced by webauthn plugin
500
+ # server-side plugins, starting with authentication ones
501
+ auth$ auth_socket
502
+ authentication_ldap_simple$ authentication_pam$ authentication_windows$
503
+ component_
504
+ libtest_
505
+ keyring_
506
+ semisync_
507
+ adt_null
508
+ audit_log
509
+ conflicting_variables
510
+ connection_control
511
+ data_masking
512
+ firewall
513
+ locking_service
514
+ mypluglib
515
+ mysql_clone
516
+ mysql_no_login
517
+ thread_pool
518
+ validate_password
519
+ version_token
520
+ ha_
521
+ qa_
522
+ .*replication
523
+ .*rewrite
524
+ .*example
525
+ .*test
526
+ .*mecab
493
527
)
494
528
495
529
set (IGNORED_LIBS
@@ -651,11 +685,7 @@ macro(bundle_plugins ignored)
651
685
652
686
get_filename_component (lib_name ${lib} NAME_WE )
653
687
654
- if (NOT lib_name MATCHES "_client" )
655
- continue ()
656
- endif ()
657
-
658
- #message("== looking at client-side plugin: ${lib_name}")
688
+ #message("== looking at plugin: ${lib_name}")
659
689
660
690
# Match plugin name against names in PLUGINS list and in case of match
661
691
# remove that name from the list
@@ -761,8 +791,10 @@ if(BUNDLE_DEPENDENCIES)
761
791
# add authentication plugins to the list of plugins
762
792
763
793
foreach (auth ${AUTH_PLUGINS} )
764
- set (plugin "authentication_${auth} " )
794
+ set (plugin "authentication_${auth} _client " )
765
795
list (APPEND PLUGINS ${plugin} )
796
+ # Note: ignore server-side plugin
797
+ list (APPEND IGNORED_PLUGINS "authentication_${auth} $" )
766
798
set (DEPS_${plugin} ${AUTH_DEPS_${auth}} )
767
799
list (APPEND IGNORED_LIBS ${DEPS_${plugin}} )
768
800
endforeach ()
0 commit comments