diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-17 19:01:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-17 19:01:28 +0200 |
| commit | 0459d2ccfc782475e596c9991e0525186953a4f3 (patch) | |
| tree | 7bdb4bb6e4a8447c3fd41d1e85c1eb8c004705c7 | |
| parent | 22cd3358b3c4faef2e3e82f74312a9fb709d9f03 (diff) | |
| parent | 2b3423c4622971048b09f68dbfb6833df4013397 (diff) | |
| download | mariadb-git-0459d2ccfc782475e596c9991e0525186953a4f3.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | CREDITS | 2 | ||||
| m--------- | libmariadb | 0 |
2 files changed, 0 insertions, 2 deletions
@@ -9,10 +9,8 @@ MariaDB Corporation https://www.mariadb.com (2013) Microsoft https://microsoft.com/ (2017) ServiceNow https://servicenow.com (2019) SIT https://sit.org (2022) -Tencent Cloud https://cloud.tencent.com (2017) Development Bank of Singapore https://dbs.com (2016) IBM https://www.ibm.com (2017) -Visma https://visma.com (2015) Automattic https://automattic.com (2019) Galera Cluster https://galeracluster.com (2020) Percona https://www.percona.com (2018) diff --git a/libmariadb b/libmariadb -Subproject 7fdb3eab66384a355475704332d11cc1ab82499 +Subproject d204e83104222844251b221e9be7eb3dd9f8d63 |