1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

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 <noreply@anthropic.com>
This commit is contained in:
Vladislav Vaintroub
2026-10-01 23:49:35 +02:00
parent be739be4b9
commit 5e3faaaa23
7 changed files with 22 additions and 1 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,3 +1,4 @@
--source include/not_embedded.inc
--source include/not_aix.inc
--require include/have_pool_of_threads.require
disable_query_log;

View File

@@ -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

View File

@@ -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'

View File

@@ -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"

View File

@@ -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;