database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/t/socket_connect.test
View File

@ -16,6 +16,7 @@ let $my_socket_debug_dbug=0;
--echo #==============================================================================
--source ../include/socket_ipv6.inc
--disable_cursor_protocol
--echo #==============================================================================
--echo # Get hostname, port number
--echo #==============================================================================
@ -291,3 +292,4 @@ WHERE EVENT_NAME LIKE '%client_connection%'
AND OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin;
--source include/wait_condition.inc
exit;
--enable_cursor_protocol