diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
| commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
| tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /Docs | |
| parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
| parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
| download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz | |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/INSTALL-BINARY | 2 | ||||
| -rw-r--r-- | Docs/mysql.info | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Docs/INSTALL-BINARY b/Docs/INSTALL-BINARY index 01ac65950a9..7ff33c7051e 100644 --- a/Docs/INSTALL-BINARY +++ b/Docs/INSTALL-BINARY @@ -31,7 +31,7 @@ also applies. first. If you run into problems and need to file a bug report, - please report them to: http://bugs.launchpad.net/maria + please report them to: http://mariadb.org/jira See the instructions in Section 1.6, "How to Report Bugs or Problems." diff --git a/Docs/mysql.info b/Docs/mysql.info index 3b9d298a684..95d97438993 100644 --- a/Docs/mysql.info +++ b/Docs/mysql.info @@ -1,10 +1,11 @@ MariaDB is in most aspects identical to MySQL. Differences between MySQL and MariaDB can be found at: -http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL +http://kb.askmonty.org/en/mariadb-versus-mysql-features/ +http://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/ -The MariaDB references manual can be found at: -http://askmonty.org/wiki/index.php/Manual +The MariaDB manual can be found at: +http://kb.askmonty.org/ The MySQL Reference Manual is available in various formats on http://dev.mysql.com/doc; if you're interested in the DocBook XML |