mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
MDEV-11111: fix the buildbot failures of the second run
- main.mysql: --server-arg now starts a private server, so the Bug#29903 check that expected "not supported" is obsolete; remove it. - libmariadbd: use the export list only where libmariadb does (macOS linker rejected it); evaluate the generator expression of the client library's link libraries (Windows LNK1104). - debian: test-connect-t is no longer built. - mysql: do not pass NULL to put_error() when mysql_server_init() fails; the glue already printed the reason. - mtr: start the private server with --skip-ssl, as the old embedded server had no TLS, so the SSL tests stay skipped. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1390,7 +1390,6 @@ int main(int argc,char *argv[])
|
||||
if (mysql_server_init(embedded_server_arg_count, embedded_server_args,
|
||||
(char**) embedded_server_groups))
|
||||
{
|
||||
put_error(NULL);
|
||||
free_defaults(defaults_argv);
|
||||
my_end(0);
|
||||
exit(1);
|
||||
|
||||
1
debian/mariadb-test.install
vendored
1
debian/mariadb-test.install
vendored
@@ -2,7 +2,6 @@ usr/bin/mariadb-client-test
|
||||
usr/bin/mariadb-test
|
||||
usr/bin/mysql_client_test
|
||||
usr/bin/mysqltest
|
||||
usr/bin/test-connect-t
|
||||
usr/lib/*/libmariadb3/plugin/auth_test_plugin.so
|
||||
usr/lib/*/libmariadb3/plugin/qa_auth_client.so
|
||||
usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
|
||||
|
||||
@@ -36,13 +36,20 @@ IF(TARGET mariadb_obj AND TARGET mariadbclient)
|
||||
ADD_LIBRARY(libmariadbd SHARED $<TARGET_OBJECTS:mariadb_obj>
|
||||
embedded_launcher.c embedded_glue.c)
|
||||
SET_TARGET_PROPERTIES(libmariadbd PROPERTIES
|
||||
LINK_FLAGS "${MARIADB_CLIENT_EXPORTS}"
|
||||
COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
||||
# Same export list as libmariadb uses, where its linker takes one
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "GNU")
|
||||
SET_TARGET_PROPERTIES(libmariadbd PROPERTIES
|
||||
LINK_FLAGS "${MARIADB_CLIENT_EXPORTS}")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
SET_TARGET_PROPERTIES(libmariadbd PROPERTIES PREFIX ""
|
||||
COMPILE_DEFINITIONS MARIADB_EMBEDDED_AUTOREGISTER)
|
||||
TARGET_LINK_LIBRARIES(libmariadbd LINK_PRIVATE
|
||||
$<TARGET_PROPERTY:mariadbclient,LINK_LIBRARIES> ${CMAKE_DL_LIBS})
|
||||
$<TARGET_GENEX_EVAL:mariadbclient,$<TARGET_PROPERTY:mariadbclient,LINK_LIBRARIES>>
|
||||
${CMAKE_DL_LIBS})
|
||||
|
||||
IF(UNIX)
|
||||
# Same API as the client library, hence the same version
|
||||
|
||||
@@ -252,7 +252,6 @@ COUNT (*)
|
||||
1
|
||||
ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno)
|
||||
End of 5.0 tests
|
||||
WARNING: --server-arg option not supported in this configuration.
|
||||
*************************** 1. row ***************************
|
||||
1: 1
|
||||
2: 2
|
||||
|
||||
@@ -402,13 +402,6 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
|
||||
|
||||
--echo End of 5.0 tests
|
||||
|
||||
#
|
||||
# Bug #29903: The CMake build method does not produce the embedded library.
|
||||
#
|
||||
--disable_query_log
|
||||
--exec $MYSQL --server-arg=no-defaults test -e "quit"
|
||||
--enable_query_log
|
||||
|
||||
#
|
||||
# Bug#26780: patch to add auto vertical output option to the cli.
|
||||
#
|
||||
|
||||
@@ -4681,6 +4681,8 @@ sub start_check_warnings ($$) {
|
||||
# configuration is written for one (the default is [server] and [embedded])
|
||||
mtr_add_arg($args, "--server-arg=--embedded-defaults-groups=%s",
|
||||
"mysqld,server,mariadb,mariadbd,client-server");
|
||||
# the old embedded server had no TLS; keep the SSL tests skipped
|
||||
mtr_add_arg($args, "--server-arg=--skip-ssl");
|
||||
}
|
||||
|
||||
my $errfile= "$opt_vardir/tmp/$name.err";
|
||||
@@ -5799,6 +5801,8 @@ sub start_mysqltest ($) {
|
||||
# configuration is written for one (the default is [server] and [embedded])
|
||||
mtr_add_arg($args, "--server-arg=--embedded-defaults-groups=%s",
|
||||
"mysqld,server,mariadb,mariadbd,client-server");
|
||||
# the old embedded server had no TLS; keep the SSL tests skipped
|
||||
mtr_add_arg($args, "--server-arg=--skip-ssl");
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user