From c83ba513da0e3d38f8001fdf4fa55e8a812e6103 Mon Sep 17 00:00:00 2001
From: Ian Gilfillan <github@greenman.co.za>
Date: Tue, 6 Aug 2024 20:34:33 +0200
Subject: [PATCH] Update sponsors

---
 CREDITS                             | 63 ++++++++++++++++++++---------
 mysql-test/main/contributors.result | 46 ++++++++++++++++-----
 sql/contributors.h                  | 48 ++++++++++++++++------
 3 files changed, 115 insertions(+), 42 deletions(-)

diff --git a/CREDITS b/CREDITS
index 35604064980..42f1697f992 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,20 +1,48 @@
 MariaDB is brought to you by the MariaDB Foundation, a non profit
 organization registered in the USA.
 
-The current main sponsors of the MariaDB Foundation are:
+As of August 2024, the main sponsors of the MariaDB Foundation are:
 
-Alibaba Cloud                   https://www.alibabacloud.com/ (2017)
-Intel				https://www.intel.com (2022)
-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)
-Automattic			https://automattic.com (2019)
-Galera Cluster			https://galeracluster.com (2020)
-Percona				https://www.percona.com (2018)
+Amazon				https://amazon.com
+Acronis				https://www.acronis.com
+Alibaba Cloud			https://www.alibabacloud.com
+C>onstructor			https://constructor.org
+Development Bank of Singapore	https://www.dbs.com
+Intel				https://www.intel.com
+MariaDB plc			https://www.mariadb.com
+ServiceNow			https://servicenow.com
+WebPros				https://webpros.com
+IBM				https://www.ibm.com
+IONOS				https://www.ionos.com
+Automattic			https://automattic.com
+SkySQL				https://skysql.com
+team.blue			https://team.blue
+Tencent Cloud			https://cloud.tencent.com
+Wikimedia Foundation		https://www.wikimediafoundation.org
+Cyber Leo			https://cyberleo.com
+Hetzner				https://www.hetzner.com
+Rumahweb			https://www.rumahweb.com
+Tasjeel.ae			https://www.tasjeel.ae
+Galera Cluster			https://galeracluster.com
+Percona				https://www.percona.com
+Vettabase			https://vettabase.com
+
+Previous sponsors include:
+
+Booking.com
+Jelastic.com
+Microsoft
+Nexedi
+Open Query
+Planeetta Web Hosting
+SpringbokSQL
+Tencent Games
+Tencent Game DBA
+Tencent TDSQL
+Verkkokauppa
+Virtuozzo
+Visma
+Webyog
 
 For a full list of sponsors, see
 https://mariadb.org/about/#sponsors
@@ -27,7 +55,7 @@ For all corporate sponsorships please contact the
 MariaDB Foundation Board via foundation@mariadb.org.
 
 The MariaDB Foundation is responsible for the MariaDB source
-repository, the official MariaDB binaries and http://mariadb.org.
+repository, the official MariaDB binaries and https://mariadb.org.
 
 The MariaDB Foundation also provides, among other things, the
 following services to the MariaDB community:
@@ -37,8 +65,8 @@ following services to the MariaDB community:
 - Merging MySQL patches into MariaDB
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
-- Maintaining http://mariadb.org
-- Documenting MariaDB in the MariaDB Knowledge Base http://mariadb.com/kb
+- Maintaining https://mariadb.org
+- Documenting MariaDB in the MariaDB Knowledge Base https://mariadb.com/kb
 
 To be able to do the above we need help from corporations and individuals!
 
@@ -49,8 +77,5 @@ go to https://mariadb.org/donate/
 You can get a list of all the main authors of MariaDB / MySQL by running 
 SHOW AUTHORS;
 
-You can get a list sponsors and contributors by running 
-SHOW CONTRIBUTORS;
-
 You can read more about the MariaDB Foundation at:
 https://mariadb.org/about/
diff --git a/mysql-test/main/contributors.result b/mysql-test/main/contributors.result
index 8d72373696c..9126385faa0 100644
--- a/mysql-test/main/contributors.result
+++ b/mysql-test/main/contributors.result
@@ -1,18 +1,42 @@
 SHOW CONTRIBUTORS;
 Name	Location	Comment
+Amazon	https://www.amazon.com/	Diamond Sponsor of the MariaDB Foundation
+Acronis	https://www.acronis.com/	Platinum Sponsor of the MariaDB Foundation
 Alibaba Cloud	https://www.alibabacloud.com/	Platinum Sponsor of the MariaDB Foundation
-Tencent Cloud	https://cloud.tencent.com	Platinum Sponsor of the MariaDB Foundation
-Microsoft	https://microsoft.com/	Platinum Sponsor of the MariaDB Foundation
-MariaDB Corporation	https://mariadb.com	Founding member, Platinum Sponsor of the MariaDB Foundation
-ServiceNow	https://servicenow.com	Platinum Sponsor of the MariaDB Foundation
-Intel	https://www.intel.com	Platinum Sponsor of the MariaDB Foundation
-SIT	https://sit.org	Platinum Sponsor of the MariaDB Foundation
-Visma	https://visma.com	Gold Sponsor of the MariaDB Foundation
-DBS	https://dbs.com	Gold Sponsor of the MariaDB Foundation
-IBM	https://www.ibm.com	Gold Sponsor of the MariaDB Foundation
-Automattic	https://automattic.com	Silver Sponsor of the MariaDB Foundation
+C<onstructor	https://www.constructor.org/	Platinum Sponsor of the MariaDB Foundation
+Development Bank of Singapore	https://www.dbs.com/	Platinum Sponsor of the MariaDB Foundation
+Intel	https://www.intel.com/	Platinum Sponsor of the MariaDB Foundation
+MariaDB plc	https://mariadb.com/	Founding member, Platinum Sponsor of the MariaDB Foundation
+ServiceNow	https://servicenow.com/	Platinum Sponsor of the MariaDB Foundation
+WebPros	https://webpros.com/	Platinum Sponsor of the MariaDB Foundation
+IBM	https://www.ibm.com/	Gold Sponsor of the MariaDB Foundation
+IONOS	https://www.ionos.com/	Gold Sponsor of the MariaDB Foundation
+Automattic	https://automattic.com/	Silver Sponsor of the MariaDB Foundation
+SkySQL	https://skysql.com/	Silver Sponsor of the MariaDB Foundation
+team.blue	https://team.blue/	Silver Sponsor of the MariaDB Foundation
+Tencent Cloud	https://cloud.tencent.com/	Silver Sponsor of the MariaDB Foundation
+Wikimedia Foundation	https://www.wikimediafoundation.org/	Silver Sponsor of the MariaDB Foundation
+Cyber Leo	https://cyberleo.com/	Bronze Sponsor of the MariaDB Foundation
+Hetzner	https://www.hetzner.com/	Bronze Sponsor of the MariaDB Foundation
+Rumahweb	https://rumahweb.com/	Bronze Sponsor of the MariaDB Foundation
+Tasjeel.ae	https://tasjeel.ae/	Bronze Sponsor of the MariaDB Foundation
+Galera Cluster	https://galeracluster.com/	Sponsor of the MariaDB Foundation
 Percona	https://www.percona.com/	Sponsor of the MariaDB Foundation
-Galera Cluster	https://galeracluster.com	Sponsor of the MariaDB Foundation
+Vettabase	https://vettabase.com/	Technology partner of the MariaDB Foundation
+Booking.com		Previous Sponsor of the MariaDB Foundation
+Jelastic.com		Previous Sponsor of the MariaDB Foundation
+Microsoft		Previous Sponsor of the MariaDB Foundation
+Nexedi		Previous Sponsor of the MariaDB Foundation
+Open Query		Previous Sponsor of the MariaDB Foundation
+Planeetta Web Hosting		Previous Sponsor of the MariaDB Foundation
+SpringbokSQL		Previous Sponsor of the MariaDB Foundation
+Tencent Games		Previous Sponsor of the MariaDB Foundation
+Tencent Game DBA		Previous Sponsor of the MariaDB Foundation
+Tencent TDSQL		Previous Sponsor of the MariaDB Foundation
+Verkkokauppa		Previous Sponsor of the MariaDB Foundation
+Virtuozzo		Previous Sponsor of the MariaDB Foundation
+Visma		Previous Sponsor of the MariaDB Foundation
+Webyog		Previous Sponsor of the MariaDB Foundation
 Google	USA	Sponsoring encryption, parallel replication and GTID
 Facebook	USA	Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
 Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction
diff --git a/sql/contributors.h b/sql/contributors.h
index bc8ba4eabbb..1a887ef3d25 100644
--- a/sql/contributors.h
+++ b/sql/contributors.h
@@ -36,20 +36,44 @@ struct show_table_contributors_st {
 */
 
 struct show_table_contributors_st show_table_contributors[]= {
-  /* MariaDB foundation sponsors, in contribution, size , time order */
+  /* MariaDB Foundation sponsors, alphabetical by tier */
+  {"Amazon", "https://www.amazon.com/", "Diamond Sponsor of the MariaDB Foundation"},
+  {"Acronis", "https://www.acronis.com/", "Platinum Sponsor of the MariaDB Foundation"},
   {"Alibaba Cloud", "https://www.alibabacloud.com/", "Platinum Sponsor of the MariaDB Foundation"},
-  {"Tencent Cloud", "https://cloud.tencent.com", "Platinum Sponsor of the MariaDB Foundation"},
-  {"Microsoft", "https://microsoft.com/", "Platinum Sponsor of the MariaDB Foundation"},
-  {"MariaDB Corporation", "https://mariadb.com", "Founding member, Platinum Sponsor of the MariaDB Foundation"},
-  {"ServiceNow", "https://servicenow.com", "Platinum Sponsor of the MariaDB Foundation"},
-  {"Intel", "https://www.intel.com", "Platinum Sponsor of the MariaDB Foundation"},
-  {"SIT", "https://sit.org", "Platinum Sponsor of the MariaDB Foundation"},
-  {"Visma", "https://visma.com", "Gold Sponsor of the MariaDB Foundation"},
-  {"DBS", "https://dbs.com", "Gold Sponsor of the MariaDB Foundation"},
-  {"IBM", "https://www.ibm.com", "Gold Sponsor of the MariaDB Foundation"},
-  {"Automattic", "https://automattic.com", "Silver Sponsor of the MariaDB Foundation"},
+  {"C<onstructor", "https://www.constructor.org/", "Platinum Sponsor of the MariaDB Foundation"},
+  {"Development Bank of Singapore", "https://www.dbs.com/", "Platinum Sponsor of the MariaDB Foundation"},
+  {"Intel", "https://www.intel.com/", "Platinum Sponsor of the MariaDB Foundation"},
+  {"MariaDB plc", "https://mariadb.com/", "Founding member, Platinum Sponsor of the MariaDB Foundation"},
+  {"ServiceNow", "https://servicenow.com/", "Platinum Sponsor of the MariaDB Foundation"},
+  {"WebPros", "https://webpros.com/", "Platinum Sponsor of the MariaDB Foundation"},
+  {"IBM", "https://www.ibm.com/", "Gold Sponsor of the MariaDB Foundation"},
+  {"IONOS", "https://www.ionos.com/", "Gold Sponsor of the MariaDB Foundation"},
+  {"Automattic", "https://automattic.com/", "Silver Sponsor of the MariaDB Foundation"},
+  {"SkySQL", "https://skysql.com/", "Silver Sponsor of the MariaDB Foundation"},
+  {"team.blue", "https://team.blue/", "Silver Sponsor of the MariaDB Foundation"},
+  {"Tencent Cloud", "https://cloud.tencent.com/", "Silver Sponsor of the MariaDB Foundation"},
+  {"Wikimedia Foundation", "https://www.wikimediafoundation.org/", "Silver Sponsor of the MariaDB Foundation"},
+  {"Cyber Leo", "https://cyberleo.com/", "Bronze Sponsor of the MariaDB Foundation"},
+  {"Hetzner", "https://www.hetzner.com/", "Bronze Sponsor of the MariaDB Foundation"},
+  {"Rumahweb", "https://rumahweb.com/", "Bronze Sponsor of the MariaDB Foundation"},
+  {"Tasjeel.ae", "https://tasjeel.ae/", "Bronze Sponsor of the MariaDB Foundation"},
+  {"Galera Cluster", "https://galeracluster.com/", "Sponsor of the MariaDB Foundation"},
   {"Percona", "https://www.percona.com/", "Sponsor of the MariaDB Foundation"},
-  {"Galera Cluster", "https://galeracluster.com", "Sponsor of the MariaDB Foundation"},
+  {"Vettabase", "https://vettabase.com/", "Technology partner of the MariaDB Foundation"},
+  {"Booking.com", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Jelastic.com", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Microsoft", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Nexedi", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Open Query", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Planeetta Web Hosting", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"SpringbokSQL", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Tencent Games", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Tencent Game DBA", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Tencent TDSQL", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Verkkokauppa", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Virtuozzo", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Visma", "", "Previous Sponsor of the MariaDB Foundation"},
+  {"Webyog", "", "Previous Sponsor of the MariaDB Foundation"},
 
   /* Sponsors of important features */
   {"Google", "USA", "Sponsoring encryption, parallel replication and GTID"},