database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-08 15:02:19 +02:00
parent 40b8f3ec1a 79660e59ee
commit a70a1cf3f4
197 changed files with 5210 additions and 1291 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

1
mysql-test/suite/perfschema/r/socket_connect.result
View File

@ -1,7 +1,6 @@
#==============================================================================
# Establish the level of IPV6 support
#==============================================================================
connection default;
#==============================================================================
# Get hostname, port number
#==============================================================================

1
mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result
View File

@ -1,7 +1,6 @@
#==============================================================================
# Establish the level of IPV6 support
#==============================================================================
connection default;
#==============================================================================
# Get hostname, port number
#==============================================================================

3
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View File

@ -38,8 +38,6 @@
# prepared statement.
--source include/no_protocol.inc
set global session_track_schema=FALSE;
#===================================
# Set IP address defaults with respect to IPV6 support
#
@ -73,6 +71,7 @@ if($my_socket_debug)
--echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost
}
#===================================
set global session_track_schema=FALSE;
--echo # The logging of commands and result sets is mostly disabled.
--echo # There are some messages which help to observe the progress of the test.