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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-06-24 13:09:47 +03:00
parent 49b4a6e26d d9dd673fee
commit 0076eb3d4e
333 changed files with 6721 additions and 6118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/rocksdb/rdb_datadic.h
View File

@@ -1584,7 +1584,7 @@ class Rdb_system_merge_op : public rocksdb::AssociativeMergeOperator {
return true;
}
virtual const char *Name() const override { return "Rdb_system_merge_op"; }
const char *Name() const override { return "Rdb_system_merge_op"; }
private:
/*