diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-10 01:06:57 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-10 01:06:57 +0400 |
| commit | 8282ed39f238d582ded11fdf9bfc2c0f48c22835 (patch) | |
| tree | e23d8ad15a987d8d756907e24c11913e603c7794 /README | |
| parent | e2d6412d42f507d9130fc7e45463a3e560914f68 (diff) | |
| download | mariadb-git-8282ed39f238d582ded11fdf9bfc2c0f48c22835.tar.gz | |
MySQL 5.1 -> MariaDB 5.1 merge
- Post-merge fixes
Diffstat (limited to 'README')
| -rw-r--r-- | README | 53 |
1 files changed, 28 insertions, 25 deletions
@@ -1,47 +1,50 @@ -This is a release of MariaDB, a branch of MySQL. - -MariaDB is a drop-in replacement of MySQL, with more features, less -bugs and better performance. - -MariaDB is brought to you by many of the original developers of MySQL, -that now work for Monty Program Ab, and by many people in the -community. - -MySQL, which is the base of MariaDB, is brought to you by Sun. +This is a release of MySQL, a dual-license SQL database server. +MySQL is brought to you by the MySQL team at Sun Microsystems, Inc. License information can be found in these files: - For GPL (free) distributions, see the COPYING file and the EXCEPTIONS-CLIENT file. +- For commercial distributions, see the LICENSE.mysql file. -A description of the MariaDB project can be found at: -http://askmonty.org/wiki/index.php/MariaDB - -The differences between MariaDB and MySQL can be found at: -http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL +GPLv2 Disclaimer +For the avoidance of doubt, except that if any license choice +other than GPL or LGPL is available it will apply instead, Sun +elects to use only the General Public License version 2 (GPLv2) +at this time for any software where a choice of GPL license versions +is made available with the language indicating that GPLv2 or any +later version may be used, or where a choice of which version of +the GPL is applied is otherwise unspecified. -Documentation about MySQL can be found at: -http://dev.mysql.com/doc - -For further information about MySQL documentation, see: -- The current MySQL documentation: +For further information about MySQL or additional documentation, see: +- The latest information about MySQL: http://www.mysql.com +- The current MySQL documentation: http://dev.mysql.com/doc Some manual sections of special interest: +- If you are migrating from an older version of MySQL, please read the + "Upgrading from..." section first! +- To see what MySQL can do, take a look at the features section. +- For installation instructions, see the Installing and Upgrading +chapter. +- For the new features/bugfix history, see the Change History appendix. +- For the currently known bugs/misfeatures (known errors) see the +Problems + and Common Errors appendix. - For a list of developers and other contributors, see the Credits appendix. A local copy of the MySQL Reference Manual can be found in the Docs directory in GNU Info format. You can also browse the manual online or -download it in any of several formats from -http://dev.mysql.com/doc +download it in any of several formats at the URL given earlier in this +file. ************************************************************ IMPORTANT: -Bug or error reports regarding MariaDB should be sent to -https://bugs.launchpad.net/maria -Bugs in the MySQL code can also be sent to http://bugs.mysql.com +Bug or error reports should be sent to http://bugs.mysql.com. + + *************************************************************************** %%The following software may be included in this product: |