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.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-10 11:53:59 +02:00
parent f4d671bff2 fe3d07cab8
commit 3bc98a4ec4
249 changed files with 7080 additions and 1864 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

50
mysql-test/suite/perfschema/r/digest_view.result
View File

@ -191,17 +191,17 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
FROM performance_schema.events_statements_summary_by_digest
ORDER BY DIGEST_TEXT;
SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR
test 883995051deb8c246585802cfd321a22 EXPLAIN SELECT * FROM `test` . `v1` 1
test 8e06c8f25266966ced26be5907ceb58f EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1
test 873c761bb3401ed8bdfe90d303202341 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1
test 58454d2c3bad0c990e97757f8affdff1 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1
test 5759533b433f70d97df585e57aaeba49 EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1
test d9abdc3309da734b3be65ee473d046ee SELECT * FROM `test` . `v1` 1
test 93fa57d3b0913e9b91896cdc73e2801d SELECT * FROM `test` . `v1` WHERE `a` = ? 1
test 98852870b265c7ff0cbfa3078163fc4d SELECT * FROM `test` . `v1` WHERE `b` > ? 1
test ef23ecdedb5da8f4e3a768ef4844f879 SELECT `a` , `b` FROM `test` . `v1` 1
test 4fb5c76cec0c3c0e9bae106499c582f9 SELECT `b` , `a` FROM `test` . `v1` 1
test 42a222de27801114b6d16e24ff22bc16 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1
test 3bcc75e0f4658692e16837ead0c455ca EXPLAIN SELECT * FROM `test` . `v1` 1
test cc55af8221ef0bc8873e75cc704489ba EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1
test bc0498551a492bd7c0ca92906bf86fb4 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1
test 76923336b6f4ffffd0d5854761ae1aec EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1
test a65d479062ffbfe374b4cd823016a260 EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1
test d44b1e50ebfd05accacef4167534ad65 SELECT * FROM `test` . `v1` 1
test 0608cde507ef8fe35d1f68730e78f1e4 SELECT * FROM `test` . `v1` WHERE `a` = ? 1
test 5e241fdb866faef138cc81b26203ddff SELECT * FROM `test` . `v1` WHERE `b` > ? 1
test 74fa770ce44994b3fe7b534d504f2d6d SELECT `a` , `b` FROM `test` . `v1` 1
test 45ca2a985d179d98395b238cf253bbe2 SELECT `b` , `a` FROM `test` . `v1` 1
test 1cfa171590aa40ba23e14c92d6940ffc TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1
DROP TABLE test.v1;
CREATE VIEW test.v1 AS SELECT * FROM test.t1;
EXPLAIN SELECT * from test.v1;
@ -248,19 +248,19 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
FROM performance_schema.events_statements_summary_by_digest
ORDER BY DIGEST_TEXT;
SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR
test bc34bb436bf5034c4263b1ad23d90292 CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1
test 869235446268944d0168011efd19fc9e DROP TABLE `test` . `v1` 1
test 883995051deb8c246585802cfd321a22 EXPLAIN SELECT * FROM `test` . `v1` 2
test 8e06c8f25266966ced26be5907ceb58f EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2
test 873c761bb3401ed8bdfe90d303202341 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2
test 58454d2c3bad0c990e97757f8affdff1 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2
test 5759533b433f70d97df585e57aaeba49 EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2
test d9abdc3309da734b3be65ee473d046ee SELECT * FROM `test` . `v1` 2
test 93fa57d3b0913e9b91896cdc73e2801d SELECT * FROM `test` . `v1` WHERE `a` = ? 2
test 98852870b265c7ff0cbfa3078163fc4d SELECT * FROM `test` . `v1` WHERE `b` > ? 2
test f06abe99801692e1a4acf36648376626 SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1
test ef23ecdedb5da8f4e3a768ef4844f879 SELECT `a` , `b` FROM `test` . `v1` 2
test 4fb5c76cec0c3c0e9bae106499c582f9 SELECT `b` , `a` FROM `test` . `v1` 2
test 42a222de27801114b6d16e24ff22bc16 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1
test 630a0b16be33fcf549f4f467de557940 CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1
test efa438aa8b4ddbf4c19f9e4b345781b5 DROP TABLE `test` . `v1` 1
test 3bcc75e0f4658692e16837ead0c455ca EXPLAIN SELECT * FROM `test` . `v1` 2
test cc55af8221ef0bc8873e75cc704489ba EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2
test bc0498551a492bd7c0ca92906bf86fb4 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2
test 76923336b6f4ffffd0d5854761ae1aec EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2
test a65d479062ffbfe374b4cd823016a260 EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2
test d44b1e50ebfd05accacef4167534ad65 SELECT * FROM `test` . `v1` 2
test 0608cde507ef8fe35d1f68730e78f1e4 SELECT * FROM `test` . `v1` WHERE `a` = ? 2
test 5e241fdb866faef138cc81b26203ddff SELECT * FROM `test` . `v1` WHERE `b` > ? 2
test a3788cc4bc96d260cfb5c3ebdfc65c6d SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1
test 74fa770ce44994b3fe7b534d504f2d6d SELECT `a` , `b` FROM `test` . `v1` 2
test 45ca2a985d179d98395b238cf253bbe2 SELECT `b` , `a` FROM `test` . `v1` 2
test 1cfa171590aa40ba23e14c92d6940ffc TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1
DROP VIEW test.v1;
DROP TABLE test.t1;

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
#==============================================================================

4
mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
View File

@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
####################################
SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
event_name digest digest_text sql_text
statement/sql/select cf4e66f3ef1e0c9905538c220053cbda SELECT ? + ? + SELECT ...
statement/sql/truncate f874a3c85ab326928c042dbd544916f9 TRUNCATE TABLE truncat...
statement/sql/select 70a97f8223477a66e716cfcc317193e2 SELECT ? + ? + SELECT ...
statement/sql/truncate ac4c7fc23914b333e9f40ce317816b8e TRUNCATE TABLE truncat...