Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

Commit f8fbf0e

Browse files
committed
wl#12653 A reference caching service
* Post push fixes to fix some mtr test cases RB#24806
1 parent a2d72c8 commit f8fbf0e

5 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎mysql-test/r/basedir.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
# Look for [ERROR] in error log (there should be none):
2727
# Look for output (there should be none):
2828
# Supressing output for initialize:
29+
Can't open shared library component_reference_cache
30+
Can't open shared library component_reference_cache
2931
# Wait for daemon server to start
3032
# Execute a query to see that it is running OK
3133
SHOW DATABASES;

‎mysql-test/r/mysqld_cmdline_warnings.result‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#
22
# WL#11109: Issue deprecation warnings on utf8mb3
33
#
4+
Can't open shared library component_reference_cache
5+
Can't open shared library component_reference_cache
46
# Warning on --character-set-server=utf8:
57
Pattern "\[Warning\] \[MY-[0-9]+] \[Server\] --character-set-server: 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release\. Please consider using UTF8MB4 in order to be unambiguous\." found
68
# Warning on --character-set-filesystem=utf8:
79
Pattern "\[Warning\] \[MY-[0-9]+] \[Server\] --character-set-filesystem: 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release\. Please consider using UTF8MB4 in order to be unambiguous\." found
10+
Can't open shared library component_reference_cache
11+
Can't open shared library component_reference_cache
812
# Warning on --character-set-server=utf8mb3:
913
Pattern "\[Warning\] \[MY-[0-9]+\] \[Server\] --character-set-server: The character set UTF8MB3 is deprecated and will be removed in a future release\. Please consider using UTF8MB4 instead\." found
1014
# Warning on --character-set-filesystem=utf8mb3:

‎mysql-test/t/basedir.test‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ EOF
174174
--echo #
175175
--echo # Try using -D with relative path
176176

177+
--replace_regex /.*component_reference_cache.*/Can't open shared library component_reference_cache/g
177178
--perl
178179
use strict;
179180
use File::Basename;

‎mysql-test/t/mysqld_cmdline_warnings.test‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
--mkdir $WL11109_DATADIR
1919

20+
--replace_regex /.*component_reference_cache.*/Can't open shared library component_reference_cache/g
2021
# 1. Start the server to test 'utf8'
2122
# The server should warn about command line parameters and exit immediately on the uninitialized datadir:
2223
--error 1
@@ -31,6 +32,7 @@
3132
--source include/search_pattern.inc
3233

3334

35+
--replace_regex /.*component_reference_cache.*/Can't open shared library component_reference_cache/g
3436
# 2. Start the server to test 'utf8mb3' and 'utf8_general_ci'.
3537
# The server should warn about command line parameters and exit immediately on the uninitialized datadir:
3638
--error 1

‎sql/mysqld.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5600,7 +5600,8 @@ static int init_server_components() {
56005600
error check of the service availability has to be done by those
56015601
plugins/components.
56025602
*/
5603-
dynamic_loader_srv->load(component_urns, NUMBER_OF_COMPONENTS);
5603+
if (!is_help_or_validate_option())
5604+
dynamic_loader_srv->load(component_urns, NUMBER_OF_COMPONENTS);
56045605

56055606
/*
56065607
Timers not needed if only starting with --help.
@@ -11647,4 +11648,4 @@ bool check_and_update_partial_revokes_sysvar(THD *thd) {
1164711648
return true;
1164811649
}
1164911650
return false;
11650-
}
11651+
}

0 commit comments

Comments
 (0)