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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-09 22:04:06 +02:00
parent e9af6b2a4d 16cebed540
commit ef781162ff
266 changed files with 7707 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/perfschema/include/socket_ipv6.inc
View File

@ -20,6 +20,7 @@ let $check_ipv6_just_check= 1;
#==============================================================================
--disable_query_log
--disable_result_log
--disable_connect_log
--disable_abort_on_error
let $check_ipv6_supported= 1;
@ -44,6 +45,7 @@ if(!$mysql_errno)
connection default;
--enable_abort_on_error
--enable_connect_log
--enable_result_log
--enable_query_log
@ -62,6 +64,7 @@ let $check_ipv4_mapped_just_check= 1;
#==============================================================================
--disable_query_log
--disable_result_log
--disable_connect_log
--disable_abort_on_error
let $check_ipv4_mapped_supported= 1;
@ -86,6 +89,7 @@ if(!$mysql_errno)
connection default;
--enable_abort_on_error
--enable_connect_log
--enable_result_log
--enable_query_log