Added information about the MariaDB foundation

Updated information in SHOW AUTHORS and SHOW CONTRIBUTORS
SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore.

CMakeLists.txt:
  Install TODO and CREDITS files
CREDITS:
  Information about the MariaDB foundation
README:
  Updated to include the MariaDB foundation
mysql-test/r/contributors.result:
  Updated contributors
mysql-test/r/show_check.result:
  SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore.
scripts/make_binary_distribution.sh:
  Added TODO and CREDITS
sql/authors.h:
  Updated list of active authors
sql/contributors.h:
  Updated list of active contributors and members of the MariaDB foundation
sql/sql_show.cc:
  Extend comment lengths
sql/sql_yacc.yy:
  SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore

10 files changed, 115 insertions, 45 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b653704de3d..8cc45f4d25b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,10 +386,11 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+INSTALL_DOCUMENTATION(README TODO CREDITS COPYING COPYING.LESSER
                       COMPONENT Readme)
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
                       ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
+
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()
diff --git a/CREDITS b/CREDITS
new file mode 100644
index 00000000000..041105f977a
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,43 @@
+MariaDB is brought to you by the MariaDB foundation, a USA non profit
+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
+
+For a full list of supporters and sponsors see
+https://mariadb.org/en/supporters/
+
+You can also do this by doing SHOW CONTRIBUTORS.
+
+For all corporate memberships and 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.
+
+The MariaDB foundation provides also, among other things, the
+following services to the MariaDB community:
+
+- Code reviews and applying patches for MariaDB
+- QA and testing of the MariaDB server
+- 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
+
+To be able to do the above we need help from cooperations and individuals!
+
+You can help support MariaDB by be becoming a MariaDB developer or a
+member or sponsor of the MariaDB foundation!
+
+You can get a list of all main authors of MariaDB / MySQL by doing
+SHOW AUTHORS;
+
+You can get a list sponsors and contributors by doing
+SHOW CONTRIBUTORS;
+
+You can read more about the MariaDB foundation at:
+https://mariadb.org/en/foundation/
diff --git a/README b/README
index 7daeec0495f..f18b2673943 100644
--- a/README
+++ b/README
@@ -3,9 +3,13 @@ This is a release of MariaDB.
 MariaDB is designed as a drop-in replacement of MySQL(R) with more
 features, new storage engines, fewer bugs, and better performance.
 
-MariaDB is brought to you by many of the original developers of MySQL
-who now work for Monty Program Ab, and by many people in the
-community.
+MariaDB is brought to you by the MariaDB foundation.
+Please read the file CREDITS for details about the MariaDB foundation,
+and who is developing MariaDB.
+
+MariaDB is developed by many of the original developers of MySQL who
+now work for MariadB foundation and SkySQL Ab, and by many people in
+the community.
 
 MySQL, which is the base of MariaDB, is a product and trademark of Oracle
 Corporation, Inc. For a list of developers and other contributors,
@@ -13,9 +17,11 @@ see the Credits appendix.  You can also do 'SHOW authors' to get a
 list of active contributors.
 
 A description of the MariaDB project and a manual can be found at:
-http://kb.askmonty.org/
-http://kb.askmonty.org/en/mariadb-versus-mysql-features/
-http://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/
+http://mariadb.org/
+https://mariadb.com/kb/en/
+https://mariadb.com/kb/en/mariadb-vs-mysql-features/
+https://mariadb.com/kb/en/mariadb-versus-mysql-features/
+https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
 
 As MariaDB is a full replacement of MySQL, the MySQL manual at
 http://dev.mysql.com/doc is generally applicable.
diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index 19fdd96b4fb..836d5858d2f 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -1,7 +1,11 @@
 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
+Parallels	http://www.parallels.com/products/plesk	Founding member 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
 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
-Warnings:
-Warning	1681	'SHOW CONTRIBUTORS' is deprecated and will be removed in a future release.
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 0e4cf6c6775..efe52894aab 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1558,8 +1558,6 @@ SET NAMES latin1;
 SHOW AUTHORS;
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1681	'SHOW AUTHORS' is deprecated and will be removed in a future release.
 SHOW CONTRIBUTORS;
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1681	'SHOW CONTRIBUTORS' is deprecated and will be removed in a future release.
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 053abb33b2c..663686ac1c8 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -312,7 +312,7 @@ fi
 # Note, no legacy "safe_mysqld" link to "mysqld_safe" in 5.1
 
 # Copy readme and license files
-cp README Docs/INSTALL-BINARY  $DEST/
+cp README Docs/INSTALL-BINARY TODO CREDITS $DEST/
 if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then
   cp COPYING EXCEPTIONS-CLIENT $DEST/
 elif [ -f LICENSE.mysql ] ; then
diff --git a/sql/authors.h b/sql/authors.h
index 84c29f8c127..406715ab074 100644
--- a/sql/authors.h
+++ b/sql/authors.h
@@ -31,41 +31,64 @@ struct show_table_authors_st {
 
   Don't be offended if your name is not in here, just add it!
 
-  IMPORTANT: Names should be added in alphabetical order (by last name).
+  Active people in the MariaDB are listed first, active people in MySQL
+  then, not active last.
 
   Names should be encoded using UTF-8.
 */
 
 struct show_table_authors_st show_table_authors[]= {
+  /* Active people on MariaDB */
   { "Michael (Monty) Widenius", "Tusby, Finland",
     "Lead developer and main author" },
-  { "David Axmark", "London, England",
-    "MySQL founder; Small stuff long time ago, Monty ripped it out!" },
   { "Sergei Golubchik", "Kerpen, Germany",
-    "Full-text search, precision math" },
+    "Architect, Full-text search, precision math, plugin framework, merges etc" },
   { "Igor Babaev", "Bellevue, USA", "Optimizer, keycache, core work"},
   { "Sergey Petrunia", "St. Petersburg, Russia", "Optimizer"},
   { "Oleksandr Byelkin", "Lugansk, Ukraine",
     "Query Cache (4.0), Subqueries (4.1), Views (5.0)" },
-  { "Brian (Krow) Aker", "Seattle, WA, USA",
-    "Architecture, archive, federated, bunch of little stuff :)" },
-  { "Marc Alff", "Denver, CO, USA", "Signal, Resignal, Performance schema" },
-  { "Venu Anuganti", "", "Client/server protocol (4.1)" },
+  { "Timour Katchaounov", "Sofia , Bulgaria", "Optimizer"},
   { "Kristian Nielsen", "Copenhagen, Denmark",
-    "General build stuff," },
+    "Replication, Async client prototocol, General buildbot stuff" },
   { "Alexander (Bar) Barkov", "Izhevsk, Russia",
-    "Unicode and character sets (4.1)" },
+    "Unicode and character sets" },
+  { "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",
+    "GIS extensions, embedded server, precision math"},
+  { "Daniel Bartholomew", "Raleigh, USA", "MariaDB documentation"},
+  { "Colin Charles", "Selangor, Malesia", "MariaDB documentation, talks at a LOT of conferences"},
+  { "Sergey Vojtovich", "Izhevsk, Russia",
+    "initial implementation of plugin architecture, maintained native storage engines (MyISAM, MEMORY, ARCHIVE, etc), rewrite of table cache"},
+  { "Vladislav Vaintroub", "Mannheim, Germany", "MariaDB Java connector, new thread pool, Windows optimizations"},
+  { "Elena Stepanova", "Sankt Petersburg, Russia", "QA, test cases"},
+  { "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" },
+  { "Percona", "CA, USA", "XtraDB, microslow patches, extensions to slow log"},
+
+  /* People working on MySQL code base (not NDB) */
   { "Guilhem Bichot", "Bordeaux, France", "Replication (since 4.0)" },
-  { "Konstantin Osipov", "Moscow, Russia",
-    "Prepared statements (4.1), Cursors (5.0)" },
+  { "Andrei Elkin", "Espoo, Finland", "Replication" },
   { "Dmitri Lenev", "Moscow, Russia",
     "Time zones support (4.1), Triggers (5.0)" },
+  { "Marc Alff", "Denver, CO, USA", "Signal, Resignal, Performance schema" },
+  { "Mikael Ronström", "Stockholm, Sweden",
+    "NDB Cluster, Partitioning, online alter table" },
+  { "Ingo Strüwing", "Berlin, Germany",
+    "Bug fixing in MyISAM, Merge tables etc" },
+  {"Marko Mäkelä", "Helsinki, Finland", "InnoDB core developer"},
+
+  /* People not active anymore */
+  { "David Axmark", "London, England",
+    "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" },
   { "John Birrell", "", "Emulation of pthread_mutex() for OS/2" },
   { "Andreas F. Bobak", "", "AGGREGATE extension to user-defined functions" },
-  { "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",
-    "GIS extensions (4.1), embedded server (4.1), precision math (5.0)"},
   { "Reggie Burnett", "Nashville, TN, USA", "Windows development, Connectors" },
   { "Kent Boortz", "Orebro, Sweden", "Test platform, and general build stuff" },
   { "Tim Bunce", "", "mysqlhotcopy" },
@@ -81,7 +104,6 @@ struct show_table_authors_st show_table_authors[]= {
   { "Antony T. Curtis", "Norwalk, CA, USA",
     "Parser, port to OS/2, storage engines and some random stuff" },
   { "Yuri Dario", "", "OS/2 port" },
-  { "Andrei Elkin", "Espoo, Finland", "Replication" },
   { "Patrick Galbraith", "Sharon, NH", "Federated Engine, mysqlslap" },
   { "Lenz Grimmer", "Hamburg, Germany",
     "Production (build and release) engineering" },
@@ -96,7 +118,6 @@ struct show_table_authors_st show_table_authors[]= {
   { "Mats Kindahl", "Storvreta, Sweden", "Replication" },
   { "Serge Kozlov", "Velikie Luki, Russia", "Testing - Cluster" },
   { "Hakan Küçükyılmaz", "Walldorf, Germany", "Testing - Server" },
-  { "Greg (Groggy) Lehey", "Uchunga, SA, Australia", "Backup" },
   { "Matthias Leich", "Berlin, Germany", "Testing - Server" },
   { "Arjen Lentz", "Brisbane, Australia",
     "Documentation (2001-2004), Dutch error messages, LOG2()" },
@@ -125,9 +146,7 @@ struct show_table_authors_st show_table_authors[]= {
     "Extended MERGE storage engine to handle INSERT" },
   { "Igor Romanenko", "",
     "mysqldump" },
-  { "Mikael Ronström", "Stockholm, Sweden",
-    "NDB Cluster, Partitioning (5.1), Optimizations" },
-  { "Tõnu Samuel", "",
+  { "Tõnu Samuel", "Estonia",
     "VIO interface, other miscellaneous features" },
   { "Carsten Segieth (Pino)", "Fredersdorf, Germany", "Testing - Server"},
   { "Martin Sköld", "Stockholm, Sweden",
@@ -138,7 +157,6 @@ struct show_table_authors_st show_table_authors[]= {
     "Windows development, Windows NT service"},
   { "Punita Srivastava", "Austin, TX, USA", "Testing - Merlin"},
   { "Alexey Stroganov (Ranger)", "Lugansk, Ukraine", "Testing - Benchmarks"},
-  { "Ingo Strüwing", "Berlin, Germany", "Bug fixing" },
   { "Magnus Svensson", "Öregrund, Sweden",
     "NDB Cluster: Integration into MySQL, test framework" },
   { "Zeev Suraski", "", "FROM_UNIXTIME(), ENCRYPT()" },
@@ -157,7 +175,6 @@ struct show_table_authors_st show_table_authors[]= {
   { "Peter Zaitsev", "Tacoma, WA, USA",
     "SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" },
   {"Mark Mark Callaghan", "Texas, USA", "Statistics patches"},
-  {"Percona", "CA, USA", "Microslow patches"},
   {NULL, NULL, NULL}
 };
 
diff --git a/sql/contributors.h b/sql/contributors.h
index b1ba2c20997..1859c5d48c5 100644
--- a/sql/contributors.h
+++ b/sql/contributors.h
@@ -30,12 +30,21 @@ struct show_table_contributors_st {
 
   Get permission before editing.
 
-  IMPORTANT: Names should be left in historical order.
-
   Names should be encoded using UTF-8.
 */
 
 struct show_table_contributors_st show_table_contributors[]= {
+  /* MariaDB foundation members, in contribution size 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"},
+  {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB foundation"},
+
+  /* Smaller sponsors, newer per year */
+  {"Jelastic.com", "Russia", "Sponsor of the MariaDB foundation"},
+  {"Planetta.net", "Finland", "Sponsor of the MariaDB foundation"},
+  {"Open query", "Australia", "Sponsor of the MariaDB foundation"},
+
+  /* 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"},
   {"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"},
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e4371250c2e..cecafcedf51 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -349,7 +349,7 @@ bool mysqld_show_authors(THD *thd)
 
   field_list.push_back(new Item_empty_string("Name",40));
   field_list.push_back(new Item_empty_string("Location",40));
-  field_list.push_back(new Item_empty_string("Comment",80));
+  field_list.push_back(new Item_empty_string("Comment",512));
 
   if (protocol->send_result_set_metadata(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
@@ -383,7 +383,7 @@ bool mysqld_show_contributors(THD *thd)
 
   field_list.push_back(new Item_empty_string("Name",40));
   field_list.push_back(new Item_empty_string("Location",40));
-  field_list.push_back(new Item_empty_string("Comment",80));
+  field_list.push_back(new Item_empty_string("Comment", 512));
 
   if (protocol->send_result_set_metadata(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 771ada6e86c..51152f125a6 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -12287,19 +12287,11 @@ show_param:
           {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_AUTHORS;
-            push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                                ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                                ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                                "SHOW AUTHORS");
           }
         | CONTRIBUTORS_SYM
           {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
-            push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                                ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                                ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                                "SHOW CONTRIBUTORS");
           }
         | PRIVILEGES
           {