From 5e3faaaa23cc4bba251c82c28f57759385c6909d Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 1 Oct 2026 23:49:35 +0200 Subject: [PATCH] MDEV-11111: fix more buildbot failures - main.mysqld--help: the three --embedded-* options are listed. - debian: libmariadb3.symbols gets mariadb_set_embedded_hooks. - mysqltest: allow 256 --server-arg (the private server of an embedded run gets more than 64 with the options of the test and of mtr). - embedded runs: skip the tests that need a TCP listener, which the private server does not have (pool of threads, ssl_verify_ip, ssl_7937); main.variables sees skip_networking ON there. Co-Authored-By: Claude Sonnet 5.5 --- client/mysqltest.cc | 2 +- debian/libmariadb3.symbols | 1 + mysql-test/include/have_pool_of_threads.inc | 1 + mysql-test/main/mysqld--help.result | 14 ++++++++++++++ mysql-test/main/ssl_7937.test | 1 + mysql-test/main/ssl_verify_ip.test | 1 + mysql-test/main/variables.test | 3 +++ 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index eef2e449286..7ee7d0ebc7b 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -73,7 +73,7 @@ static my_bool non_blocking_api_enabled= 0; #define MAX_VAR_NAME_LENGTH 256 #define MAX_COLUMNS 256 -#define MAX_EMBEDDED_SERVER_ARGS 64 +#define MAX_EMBEDDED_SERVER_ARGS 256 #define MAX_DELIMITER_LENGTH 16 #define DEFAULT_MAX_CONN 64 diff --git a/debian/libmariadb3.symbols b/debian/libmariadb3.symbols index f7dab874378..56aa13be5c1 100644 --- a/debian/libmariadb3.symbols +++ b/debian/libmariadb3.symbols @@ -25,6 +25,7 @@ libmariadb.so.3 libmariadb3 #MINVER# mariadb_rpl_init_ex@libmariadb_3 3.3.0 mariadb_rpl_open@libmariadb_3 3.1.0 mariadb_rpl_optionsv@libmariadb_3 3.1.0 + mariadb_set_embedded_hooks@libmariadb_3 3.4.10 mariadb_stmt_execute_direct@libmariadb_3 3.0.0 mariadb_stmt_fetch_fields@libmariadb_3 3.1.0 mysql_affected_rows@libmariadbclient_18 3.0.0 diff --git a/mysql-test/include/have_pool_of_threads.inc b/mysql-test/include/have_pool_of_threads.inc index 62460127d88..061e7a2aebf 100644 --- a/mysql-test/include/have_pool_of_threads.inc +++ b/mysql-test/include/have_pool_of_threads.inc @@ -1,3 +1,4 @@ +--source include/not_embedded.inc --source include/not_aix.inc --require include/have_pool_of_threads.require disable_query_log; diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 15ffb8cbcf7..2f5f5cd52b6 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -317,6 +317,17 @@ The following specify which files/extra groups are read (specified before remain --div-precision-increment=# Precision of the result of '/' operator will be increased on that value + --embedded-client-pid=# + Used by the embedded server launcher. The only process + that may connect + --embedded-defaults-groups=name + Used by the embedded server launcher. The option groups + to read, instead of those of a server, separated by + commas + --embedded-lifeline=name + Used by the embedded server launcher. Inherited pipe fd + (HANDLE on Windows) that the server watches; on EOF the + server shuts down --encrypt-binlog Encrypt binary logs (including relay logs) --encrypt-tmp-disk-tables Encrypt temporary on-disk tables (created as part of @@ -1808,6 +1819,9 @@ delayed-insert-timeout 300 delayed-queue-size 1000 disconnect-on-expired-password FALSE div-precision-increment 4 +embedded-client-pid 0 +embedded-defaults-groups (No default value) +embedded-lifeline (No default value) encrypt-binlog FALSE encrypt-tmp-disk-tables FALSE encrypt-tmp-files FALSE diff --git a/mysql-test/main/ssl_7937.test b/mysql-test/main/ssl_7937.test index 444e3ec6a1b..ebfb82a10bf 100644 --- a/mysql-test/main/ssl_7937.test +++ b/mysql-test/main/ssl_7937.test @@ -2,6 +2,7 @@ # MDEV-7937: Enforce SSL when --ssl client option is used # +source include/not_embedded.inc; source include/have_ssl_crypto_functs.inc; # create a procedure instead of SHOW STATUS LIKE 'ssl_cipher' diff --git a/mysql-test/main/ssl_verify_ip.test b/mysql-test/main/ssl_verify_ip.test index 2a2e780ecfc..bf6de4a4753 100644 --- a/mysql-test/main/ssl_verify_ip.test +++ b/mysql-test/main/ssl_verify_ip.test @@ -1,3 +1,4 @@ +source include/not_embedded.inc; source include/have_ssl_crypto_functs.inc; --exec $MYSQL --protocol=tcp --host=127.0.0.1 --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl --ssl-verify-server-cert -e "select 1" --exec $MYSQL --protocol=tcp --host=localhost --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl --ssl-verify-server-cert -e "select 1" diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test index 7e2b7e6ef55..ea7b7cca450 100644 --- a/mysql-test/main/variables.test +++ b/mysql-test/main/variables.test @@ -1089,9 +1089,12 @@ SET @@session.skip_external_locking= true; SET @@global.skip_external_locking= true; # --echo # +# The private server of an embedded run has no network listener +--replace_result ON OFF SHOW VARIABLES like 'skip_networking'; --error ER_INCORRECT_GLOBAL_LOCAL_VAR SELECT @@session.skip_networking; +--replace_result 1 0 SELECT @@global.skip_networking; --error ER_INCORRECT_GLOBAL_LOCAL_VAR SET @@session.skip_networking= true;