mariadb/storage
Nikita Malyavin 0108664a8a Merge branch 10.11 into 11.4
# Conflicts:
#	sql/handler.h
#	sql/log_event.h
#	sql/log_event_server.cc
2025-09-02 15:58:39 +02:00
..
archive Merge branch '10.11' into 11.0 2024-05-12 12:18:28 +02:00
blackhole Merge 10.11 into 11.4 2024-12-02 11:35:34 +02:00
columnstore Update ColumnStore 23.10.5-1 2025-07-27 15:44:07 +02:00
connect Merge branch 10.11 into 11.4 2025-09-02 15:58:39 +02:00
csv Merge branch '10.11' into 11.4 2025-07-28 19:40:10 +02:00
example Merge branch '10.11' into 11.4 2025-06-17 09:50:22 +02:00
federated Merge 10.11 into 11.4 2024-12-02 11:35:34 +02:00
federatedx Merge branch '10.11' into 11.4 2025-04-26 10:53:02 +02:00
heap Fixed costs in JOIN_TAB::estimate_scan_time() and HEAP 2025-02-10 15:59:28 +02:00
innobase Merge branch 10.11 into 11.4 2025-09-02 15:58:39 +02:00
maria Merge branch 10.11 into 11.4 2025-09-02 15:58:39 +02:00
mroonga Merge branch 10.11 into 11.4 2025-09-02 15:58:39 +02:00
myisam Merge branch 10.11 into 11.4 2025-09-02 15:58:39 +02:00
myisammrg Merge 10.11 into 11.4 2025-01-09 07:58:08 +02:00
oqgraph Merge 10.11 into 11.4 2024-12-02 11:35:34 +02:00
perfschema Merge branch '10.11' into 11.4 2025-06-17 09:50:22 +02:00
rocksdb Merge branch '10.11' into 11.4 2025-07-28 19:40:10 +02:00
sequence Merge branch '10.11' into 11.1 2024-07-08 22:40:16 +02:00
sphinx Merge 10.11 into 11.4 2024-12-02 11:35:34 +02:00
spider Merge branch '10.11' into 11.4 2025-07-28 19:40:10 +02:00
test_sql_discovery Merge 10.5 into 10.6 2024-06-24 13:09:47 +03:00