diff --git a/ChangeLog b/ChangeLog index 64772dde8..068fe1e2f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-12-27 Alexander M. Turek + * Documentation.html, README: I tested phpMyAdmin with MySQL 5.0.0-alpha. + 2003-12-25 Marc Delisle - * db_details_qbe.php: error when generating joins + * db_details_qbe.php: error when generating joins * Documentation.html: FAQ 6.22: default bookmark execution 2003-12-23 Marc Delisle @@ -43,7 +46,7 @@ $Source$ * tbl_change.php: max BLOB upload size 2003-12-12 Marc Delisle - * db_details.php, libraries/common.lib.php, lang/*: + * db_details.php, libraries/common.lib.php, lang/*: new feature to display the maximum upload size TODO: detect if upload succeeded diff --git a/Documentation.html b/Documentation.html index d435ce589..835086aae 100755 --- a/Documentation.html +++ b/Documentation.html @@ -2396,19 +2396,21 @@ To create a new, empty mimetype please see libraries/transformations/template_ge that the older your MySQL version is, the more limitations you will have to face.
- phpMyAdmin provides experimental support for MySQL 4.1. That means that - although you can assign character sets to a table or field, phpMyAdmin will - not recode the data when inserting or extracting it. Instead, it will still - use the character set you specified for the MySQL connection.
+ phpMyAdmin provides experimental support for MySQL 4.1 and 5.0. That + means that although you can assign character sets to a table or field, + phpMyAdmin will not recode the data when inserting or extracting it. + Instead, it will still use the character set you specified for the MySQL + onnection.
When compiling php, we strongly recommend that you manually link the MySQL extension to a MySQL client library of at least the same version since the - one that is bundled with php 4.x is rather old and might cause problems. + one that is bundled with current php distributions is rather old and might + cause problems.
Also, we do not yet support the imporoved MySQL extension (mysqli) that comes with php 5. For the moment, the old MySQL extension should also work fine here, if compiled correctly.
- MySQL 5.0 and 5.1 are not yet supported. + MySQL 5.1 is not yet supported.

diff --git a/README b/README index 5db7a07c2..2ed75b0b3 100755 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to administrate MySQL over the WWW. - Version 2.5.5-rc1 + Version 2.5.6-dev ----------------- http://www.phpmyadmin.net/ @@ -32,8 +32,8 @@ phpMyAdmin - Readme Requirements: php 4.1.0 or later MySQL 3.23.32 or later - Note: The implemented MySQL 4.1.x support is experimental! - For more details, see Documentation.txt /.html + Note: The implemented support for MySQL 4.1.x and 5.0.x is experimental! + For more details, see Documentation.txt / .html a web-browser (doh!) Summary: