diff options
| -rw-r--r-- | CREDITS | 7 | ||||
| -rw-r--r-- | mysql-test/r/contributors.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/show_check.test | 2 | ||||
| -rw-r--r-- | sql/authors.h | 11 | ||||
| -rw-r--r-- | sql/contributors.h | 12 |
5 files changed, 31 insertions, 7 deletions
@@ -3,9 +3,10 @@ organization. The current main members and sponsors of the MariaDB foundation are: -Booking.com http://www.booking.com -SkySQL Ab http://www.skysql.com -Parallels http://www.parallels.com/products/plesk +Automattic http://automattic.com (2014) +SkySQL Ab http://www.skysql.com (2013, 2014) +Booking.com http://www.booking.com (2013) +Parallels http://www.parallels.com/products/plesk (2013) For a full list of supporters and sponsors see https://mariadb.org/en/supporters/ diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result index 836d5858d2f..d578d43cb62 100644 --- a/mysql-test/r/contributors.result +++ b/mysql-test/r/contributors.result @@ -2,10 +2,16 @@ SHOW CONTRIBUTORS; Name Location Comment Booking.com http://www.booking.com Founding member of the MariaDB foundation SkySQL Ab http://www.skysql.com Founding member of the MariaDB foundation +Auttomatic http://automattic.com Member of the MariaDB foundation Parallels http://www.parallels.com/products/plesk Founding member of the MariaDB foundation +Verkkokauppa.com Finland Sponsor of the MariaDB foundation +Webyog Bangalor Sponsor of the MariaDB foundation +Percona USA Sponsor of the MariaDB foundation Jelastic.com Russia Sponsor of the MariaDB foundation Planetta.net Finland Sponsor of the MariaDB foundation Open query Australia Sponsor of the MariaDB foundation +Google USA Sponsoring parallel replication and GTID +Facebook USA Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc Ronald Bradford Brisbane, Australia EFF contribution for UC2006 Auction Sheeri Kritzer Boston, Mass. USA EFF contribution for UC2006 Auction Mark Shuttleworth London, UK. EFF contribution for UC2006 Auction diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 32bf5417a0a..14d50709921 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -1375,7 +1375,7 @@ SET NAMES latin1; --echo # ---echo # WL#6454: Deprecate SHOW AUTHORS and SHOW CONTRIBUTORS +--echo # Test SHOW AUTHORS and SHOW CONTRIBUTORS --echo # --disable_result_log diff --git a/sql/authors.h b/sql/authors.h index 406715ab074..cc9889bcdbc 100644 --- a/sql/authors.h +++ b/sql/authors.h @@ -35,6 +35,8 @@ struct show_table_authors_st { then, not active last. Names should be encoded using UTF-8. + + See also https://mariadb.com/kb/en/log-of-mariadb-contributions/ */ struct show_table_authors_st show_table_authors[]= { @@ -63,7 +65,14 @@ struct show_table_authors_st show_table_authors[]= { { "Georg Richter", "Heidelberg, Germany", "New LGPL C connector, PHP connector"}, { "Jan Lindström", "Ylämylly, Finland", "Working on InnoDB"}, { "Lixun Peng", "Hangzhou, China", "Multi Source replication" }, + { "Olivier Bertrand", "Paris, France", "CONNECT storage engine"}, + { "Kentoku Shiba", "Tokyo, Japan", "Spider storage engine, metadata_lock_info Information schema"}, { "Percona", "CA, USA", "XtraDB, microslow patches, extensions to slow log"}, + { "Vicentiu Ciorbaru", "Bucharest, Romania", "Roles"}, + { "Sudheera Palihakkara", "", "PCRE Regular Expressions" }, + { "Pavel Ivanov", "USA", "Some patches and bug fixes"}, + { "Konstantin Osipov", "Moscow, Russia", + "Prepared statements (4.1), Cursors (5.0), GET_LOCK (10.0)" }, /* People working on MySQL code base (not NDB) */ { "Guilhem Bichot", "Bordeaux, France", "Replication (since 4.0)" }, @@ -82,8 +91,6 @@ struct show_table_authors_st show_table_authors[]= { "MySQL founder; Small stuff long time ago, Monty ripped it out!" }, { "Brian (Krow) Aker", "Seattle, WA, USA", "Architecture, archive, blackhole, federated, bunch of little stuff :)" }, - { "Konstantin Osipov", "Moscow, Russia", - "Prepared statements (4.1), Cursors (5.0)" }, { "Venu Anuganti", "", "Client/server protocol (4.1)" }, { "Omer BarNir", "Sunnyvale, CA, USA", "Testing (sometimes) and general QA stuff" }, diff --git a/sql/contributors.h b/sql/contributors.h index 1859c5d48c5..2479f611727 100644 --- a/sql/contributors.h +++ b/sql/contributors.h @@ -31,19 +31,29 @@ struct show_table_contributors_st { Get permission before editing. Names should be encoded using UTF-8. + + See also https://mariadb.com/kb/en/log-of-mariadb-contributions/ */ struct show_table_contributors_st show_table_contributors[]= { - /* MariaDB foundation members, in contribution size order */ + /* MariaDB foundation members, in contribution, size , time order */ {"Booking.com", "http://www.booking.com", "Founding member of the MariaDB foundation"}, {"SkySQL Ab", "http://www.skysql.com", "Founding member of the MariaDB foundation"}, + {"Auttomatic", "http://automattic.com", "Member of the MariaDB foundation"}, {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB foundation"}, /* Smaller sponsors, newer per year */ + {"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB foundation"}, + {"Webyog", "Bangalor", "Sponsor of the MariaDB foundation"}, + {"Percona", "USA", "Sponsor of the MariaDB foundation"}, {"Jelastic.com", "Russia", "Sponsor of the MariaDB foundation"}, {"Planetta.net", "Finland", "Sponsor of the MariaDB foundation"}, {"Open query", "Australia", "Sponsor of the MariaDB foundation"}, + /* Sponsors of important features */ + {"Google", "USA", "Sponsoring parallel replication and GTID" }, + {"Facebook", "USA", "Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc"}, + /* Individual contributors, names in historical order, newer first */ {"Ronald Bradford", "Brisbane, Australia", "EFF contribution for UC2006 Auction"}, {"Sheeri Kritzer", "Boston, Mass. USA", "EFF contribution for UC2006 Auction"}, |