mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-30818 invalid ssl prevents bootstrap

Browse source 
in bootstrap the server reads stdin and does not listen to network.
it won't use ssl anyway
This commit is contained in:
Sergei Golubchik 2023-03-09 11:22:41 +01:00
parent fb7d588153
commit 4c4939bbf6
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/main/bootstrap.result
View file

@ -61,5 +61,8 @@ truncate table mysql.plugin;
# MDEV-13397 MariaDB upgrade fail when using default_time_zone # MDEV-13397 MariaDB upgrade fail when using default_time_zone
# #
# #
# MDEV-30818 invalid ssl prevents bootstrap
#
#
# End of 10.3 tests # End of 10.3 tests
# #

5
mysql-test/main/bootstrap.test
View file

@ -119,6 +119,11 @@ truncate table mysql.plugin;
--echo # --echo #
--exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 --exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--echo #
--echo # MDEV-30818 invalid ssl prevents bootstrap
--echo #
--exec $MYSQLD_BOOTSTRAP_CMD --ssl-ca=/dev/nonexistent < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--echo # --echo #
--echo # End of 10.3 tests --echo # End of 10.3 tests
--echo # --echo #

5
sql/mysqld.cc
View file

@ -5026,7 +5026,10 @@ static void init_ssl()
{ {
sql_print_error("Failed to setup SSL"); sql_print_error("Failed to setup SSL");
sql_print_error("SSL error: %s", sslGetErrString(error)); sql_print_error("SSL error: %s", sslGetErrString(error));
unireg_abort(1); if (!opt_bootstrap)
unireg_abort(1);
opt_use_ssl = 0;
have_ssl= SHOW_OPTION_DISABLED;
} }
if (global_system_variables.log_warnings > 0) if (global_system_variables.log_warnings > 0)
{ {