database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 14:44:43 +03:00
parent 23d1092f8e b1b47264d2
commit bce3ee704f
146 changed files with 4385 additions and 2140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mysql-test/main/analyze_format_json.result
View File

@ -22,6 +22,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 30,
"attached_condition": "t0.a < 3"
@ -58,6 +59,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 0,
"attached_condition": "t0.a > 9 and t0.a is not null"
@ -75,6 +77,7 @@ ANALYZE
"r_loops": 0,
"rows": 1,
"r_rows": null,
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": null
}
@ -108,6 +111,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100,
"attached_condition": "t0.a is not null"
@ -127,6 +131,7 @@ ANALYZE
"r_rows": 1,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 40,
"attached_condition": "t1.b < 4"
@ -161,6 +166,7 @@ ANALYZE
"r_rows": 100,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 20,
"attached_condition": "tbl1.b < 20"
@ -176,6 +182,7 @@ ANALYZE
"r_rows": 100,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 60,
"attached_condition": "tbl2.b < 60"
@ -214,6 +221,7 @@ ANALYZE
"r_rows": 100,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 20,
"attached_condition": "tbl1.b < 20"
@ -229,6 +237,7 @@ ANALYZE
"r_rows": 100,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 60,
"attached_condition": "tbl2.b < 60"
@ -276,6 +285,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100,
"attached_condition": "t1.a is not null"
@ -295,6 +305,7 @@ ANALYZE
"r_rows": 0.2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100,
"using_index": true
@ -337,6 +348,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 50,
"attached_condition": "test.t1.a < 5"
@ -376,7 +388,8 @@ ANALYZE
"rows": 1000,
"r_rows": 1000,
"r_filtered": 100,
"r_total_time_ms": "REPLACED"
"r_total_time_ms": "REPLACED",
"r_engine_stats": REPLACED
}
}
}
@ -405,6 +418,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 50,
"index_condition": "t1.pk < 10",
@ -436,6 +450,7 @@ ANALYZE
"r_rows": 10,
"r_filtered": 50,
"r_total_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"attached_condition": "t1.pk < 10 and t1.b > 4"
}
}
@ -481,6 +496,7 @@ ANALYZE
"r_rows": 5,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -507,6 +523,7 @@ ANALYZE
"r_rows": 203.8,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 98.13542689
}
@ -551,6 +568,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 50,
"attached_condition": "tbl1.a < 5"
@ -575,6 +593,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 20,
"attached_condition": "tbl2.a in (2,3)"
@ -632,6 +651,7 @@ ANALYZE
"r_rows": 256,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -671,6 +691,7 @@ ANALYZE
"r_rows": 256,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -724,6 +745,7 @@ ANALYZE
"r_rows": 256,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -761,6 +783,7 @@ ANALYZE
"r_rows": 2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -775,6 +798,7 @@ ANALYZE
"r_rows": 2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 0,
"attached_condition": "<in_optimizer>(t2.b,t2.b in (subquery#2))"
@ -807,6 +831,7 @@ ANALYZE
"r_rows": 2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -869,6 +894,7 @@ ANALYZE
"r_rows": 2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 100
}
@ -883,6 +909,7 @@ ANALYZE
"r_rows": 2,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 0,
"attached_condition": "t3.f3 in (1,2)"
@ -913,6 +940,7 @@ ANALYZE
"r_loops": 0,
"rows": 2,
"r_rows": null,
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": null
}
@ -925,6 +953,7 @@ ANALYZE
"r_loops": 0,
"rows": 2,
"r_rows": null,
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": null
},
@ -979,6 +1008,7 @@ ANALYZE
"r_rows": 10,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": 0,
"attached_condition": "t1.a < 0"
@ -1009,6 +1039,7 @@ ANALYZE
"r_loops": 0,
"rows": 10,
"r_rows": null,
"r_engine_stats": REPLACED,
"filtered": 100,
"r_filtered": null,
"attached_condition": "t2.a < t1.a"
@ -1068,6 +1099,7 @@ ANALYZE
"r_rows": 1000,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 10,
"r_filtered": 10,
"attached_condition": "t11.a < 100"
@ -1083,6 +1115,7 @@ ANALYZE
"r_rows": 1000,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 70,
"r_filtered": 70,
"attached_condition": "t10.a < 700"
@ -1127,6 +1160,7 @@ ANALYZE
"r_rows": 1000,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 10,
"r_filtered": 10,
"attached_condition": "t11.a < 100 and t11.b is not null"
@ -1146,6 +1180,7 @@ ANALYZE
"r_rows": 1000,
"r_table_time_ms": "REPLACED",
"r_other_time_ms": "REPLACED",
"r_engine_stats": REPLACED,
"filtered": 70,
"r_filtered": 70,
"attached_condition": "t10.a < 700"