Skip to content

Commit

Permalink
merge dev to main
Browse files Browse the repository at this point in the history
Merge dev to main
  • Loading branch information
ShannonBase authored Dec 15, 2024
1 parent 9af1cc8 commit 8fc4688
Show file tree
Hide file tree
Showing 18 changed files with 848 additions and 52 deletions.
2 changes: 1 addition & 1 deletion mysql-test/r/mysqld--help-notwin.result
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ query-prealloc-size 8192
range-alloc-block-size 4096
range-optimizer-max-mem-size 8388608
rapid-rapid-memory-size-max 8589934592
rapid-rapid-pop-buffer-size-max 67108864
rapid-rapid-pop-buffer-size-max 134217728
read-buffer-size 131072
read-only FALSE
read-rnd-buffer-size 262144
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/innodb_fts/r/opt.result
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.10",
"prefix_cost": "0.35",
"data_read_per_join": "8"
"data_read_per_join": "10"
},
"used_columns": [
"f1"
Expand Down
24 changes: 12 additions & 12 deletions mysql-test/suite/json/r/json_agg.result
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"a",
Expand Down Expand Up @@ -197,7 +197,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"a",
Expand Down Expand Up @@ -234,7 +234,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"a",
Expand Down Expand Up @@ -273,7 +273,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"a",
Expand Down Expand Up @@ -304,7 +304,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"b"
Expand Down Expand Up @@ -332,7 +332,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"b"
Expand Down Expand Up @@ -360,7 +360,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"b"
Expand Down Expand Up @@ -390,7 +390,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"b"
Expand Down Expand Up @@ -526,7 +526,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"a",
Expand Down Expand Up @@ -557,7 +557,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.80",
"prefix_cost": "1.05",
"data_read_per_join": "448"
"data_read_per_join": "464"
},
"used_columns": [
"k",
Expand Down Expand Up @@ -638,7 +638,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.10",
"prefix_cost": "0.35",
"data_read_per_join": "8"
"data_read_per_join": "10"
},
"attached_condition": "(0 <> json_arrayagg(<cache>(<in_optimizer>(1,<exists>(/* select#3 */ select 1 from `test`.`t` where true)))))"
},
Expand All @@ -661,7 +661,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.10",
"prefix_cost": "0.35",
"data_read_per_join": "8"
"data_read_per_join": "10"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/suite/json/r/json_functions_innodb.result
Original file line number Diff line number Diff line change
Expand Up @@ -10456,7 +10456,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.20",
"prefix_cost": "0.45",
"data_read_per_join": "48"
"data_read_per_join": "52"
},
"used_columns": "filtered due to bug#22472365",
"partial_update_columns": [
Expand Down Expand Up @@ -10486,7 +10486,7 @@ EXPLAIN
"read_cost": "0.50",
"eval_cost": "0.20",
"prefix_cost": "1.15",
"data_read_per_join": "48"
"data_read_per_join": "52"
},
"used_columns": "filtered due to bug#22472365"
}
Expand Down Expand Up @@ -10542,7 +10542,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.20",
"prefix_cost": "0.45",
"data_read_per_join": "48"
"data_read_per_join": "52"
},
"used_columns": [
"id",
Expand Down Expand Up @@ -10577,7 +10577,7 @@ EXPLAIN
"read_cost": "0.50",
"eval_cost": "0.20",
"prefix_cost": "1.15",
"data_read_per_join": "48"
"data_read_per_join": "52"
},
"used_columns": [
"id",
Expand Down Expand Up @@ -10632,7 +10632,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.20",
"prefix_cost": "0.45",
"data_read_per_join": "48"
"data_read_per_join": "52"
},
"used_columns": "filtered due to bug#22472365"
}
Expand All @@ -10649,7 +10649,7 @@ EXPLAIN
"read_cost": "0.25",
"eval_cost": "0.60",
"prefix_cost": "1.30",
"data_read_per_join": "144"
"data_read_per_join": "156"
},
"used_columns": "filtered due to bug#22472365"
}
Expand Down
54 changes: 54 additions & 0 deletions mysql-test/suite/perfschema/all_tests.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
drop table if exists t1;
drop table if exists t2;
create table t1 (test_name text);
create table t2 (test_name text);
load data infile "<MYSQLTEST_VARDIR>/tmp/perfschema-all_tests.txt" into table t1;
insert into t2 select concat('ddl_', table_name, '.test') from information_schema.tables
where table_schema='performance_schema';
insert into t2 select concat('dml_', table_name, '.test') from information_schema.tables
where table_schema='performance_schema';
insert into t2 select concat('idx_', table_name, '.test') from information_schema.tables
where table_schema='performance_schema';
update t2 set test_name= replace(test_name, "events_waits_summary_", "ews_");
update t2 set test_name= replace(test_name, "events_stages_summary_", "esgs_");
update t2 set test_name= replace(test_name, "events_statements_histogram_", "esmh_");
update t2 set test_name= replace(test_name, "events_statements_summary_", "esms_");
update t2 set test_name= replace(test_name, "events_transactions_summary_", "ets_");
update t2 set test_name= replace(test_name, "events_errors_summary_", "ees_");
update t2 set test_name= replace(test_name, "file_summary_", "fs_");
update t2 set test_name= replace(test_name, "objects_summary_", "os_");
update t2 set test_name= replace(test_name, "table_io_waits_summary_", "tiws_");
update t2 set test_name= replace(test_name, "table_lock_waits_summary_", "tlws_");
update t2 set test_name= replace(test_name, "memory_summary_", "mems_");
update t2 set test_name= replace(test_name, "user_variables_", "uvar_");
delete from t2 where t2.test_name in (select t1.test_name from t1);
select test_name as `MISSING DDL/DML TESTS` from t2;
MISSING DDL/DML TESTS
ddl_replication_asynchronous_connection_failover.test
ddl_replication_asynchronous_connection_failover_managed.test
ddl_rpd_column_id.test
ddl_rpd_columns.test
ddl_rpd_preload_stats.test
ddl_rpd_table_id.test
ddl_rpd_tables.test
dml_replication_asynchronous_connection_failover.test
dml_replication_asynchronous_connection_failover_managed.test
dml_rpd_column_id.test
dml_rpd_columns.test
dml_rpd_preload_stats.test
dml_rpd_table_id.test
dml_rpd_tables.test
idx_binary_log_transaction_compression_stats.test
idx_log_status.test
idx_replication_applier_filters.test
idx_replication_applier_global_filters.test
idx_replication_asynchronous_connection_failover.test
idx_replication_asynchronous_connection_failover_managed.test
idx_rpd_column_id.test
idx_rpd_columns.test
idx_rpd_preload_stats.test
idx_rpd_table_id.test
idx_rpd_tables.test
idx_user_defined_functions.test
drop table t1;
drop table t2;
Loading

0 comments on commit 8fc4688

Please sign in to comment.