Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal/drupal/INSTALL.txt,v retrieving revision 1.80 diff -u -p -r1.80 INSTALL.txt --- INSTALL.txt 30 Apr 2010 08:09:21 -0000 1.80 +++ INSTALL.txt 24 Jul 2010 16:45:55 -0000 @@ -16,11 +16,14 @@ REQUIREMENTS Drupal requires: - - a web server, Apache (version 2.0 or greater) is recommended, - - PHP 5 (5.2.0 or greater) (http://www.php.net/), - - and either MySQL (5.0.15 or greater) (http://www.mysql.com/), PostgreSQL (8.3 - or greater) (http://www.postgresql.org/), or SQLite (3.4.2 or greater) - (http://www.sqlite.org/). +- A web server. Apache (version 2.0 or greater) is recommended. +- PHP 5.2.0 (or greater) (http://www.php.net/). +- One of the following databases: + - MySQL 5.0.15 (or greater) (http://www.mysql.com/). + - MariaDB 5.1.44 (or greater) (http://mariadb.org/). MariaDB is fully + compatible with MySQL and is recommended instead of MySQL. + - PostgreSQL 8.3 (or greater) (http://www.postgresql.org/). + - SQLite 3.4.2 (or greater) (http://www.sqlite.org/). For more detailed information about Drupal requirements, including a list of PHP extensions and configurations that are required, see "System requirements" Index: includes/install.core.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.core.inc,v retrieving revision 1.25 diff -u -p -r1.25 install.core.inc --- includes/install.core.inc 2 Jul 2010 15:32:10 -0000 1.25 +++ includes/install.core.inc 24 Jul 2010 16:45:56 -0000 @@ -858,7 +858,7 @@ function install_settings_form($form, &$ ); if (count($drivers) == 1) { $form['driver']['#disabled'] = TRUE; - $form['driver']['#description'] .= ' ' . st('Your PHP configuration only supports the %driver database type so it has been automatically selected.', array('%driver' => current($drivers))); + $form['driver']['#description'] .= ' ' . st('Your PHP configuration only supports a single database type, so it has been automatically selected.'); } // Database name. Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.137 diff -u -p -r1.137 install.inc --- includes/install.inc 22 Jul 2010 23:54:32 -0000 1.137 +++ includes/install.inc 24 Jul 2010 16:45:57 -0000 @@ -278,7 +278,7 @@ abstract class DatabaseTasks { 'arguments' => array( 'CREATE TABLE drupal_install_test (id int NULL)', 'Drupal can use CREATE TABLE database commands.', - 'Failed to CREATE a test table on your %name database server with the command %query. %name reports the following message: %error.

Are you sure the configured username has the necessary %name permissions to create tables in the database?

', + 'Failed to CREATE a test table on your %name database server with the command %query. The server reports the following message: %error.

Are you sure the configured username has the necessary permissions to create tables in the database?

', TRUE, ), ), @@ -286,28 +286,28 @@ abstract class DatabaseTasks { 'arguments' => array( 'INSERT INTO drupal_install_test (id) VALUES (1)', 'Drupal can use INSERT database commands.', - 'Failed to INSERT a value into a test table on your %name database server. We tried inserting a value with the command %query and %name reported the following error: %error.', + 'Failed to INSERT a value into a test table on your %name database server. We tried inserting a value with the command %query and the server reported the following error: %error.', ), ), array( 'arguments' => array( 'UPDATE drupal_install_test SET id = 2', 'Drupal can use UPDATE database commands.', - 'Failed to UPDATE a value in a test table on your %name database server. We tried updating a value with the command %query and %name reported the following error: %error.', + 'Failed to UPDATE a value in a test table on your %name database server. We tried updating a value with the command %query and the server reported the following error: %error.', ), ), array( 'arguments' => array( 'DELETE FROM drupal_install_test', 'Drupal can use DELETE database commands.', - 'Failed to DELETE a value from a test table on your %name database server. We tried deleting a value with the command %query and %name reported the following error: %error.', + 'Failed to DELETE a value from a test table on your %name database server. We tried deleting a value with the command %query and the server reported the following error: %error.', ), ), array( 'arguments' => array( 'DROP TABLE drupal_install_test', 'Drupal can use DROP TABLE database commands.', - 'Failed to DROP a test table from your %name database server. We tried dropping a table with the command %query and %name reported the following error %error.', + 'Failed to DROP a test table from your %name database server. We tried dropping a table with the command %query and the server reported the following error %error.', ), ), ); @@ -394,7 +394,7 @@ abstract class DatabaseTasks { $this->pass('Drupal can CONNECT to the database ok.'); } catch (Exception $e) { - $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.For more help, see the installation handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name()))); + $this->fail(st('Failed to connect to your %name database server. The server reports the following message: %error.For more help, see the installation handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name()))); return FALSE; } return TRUE; Index: includes/database/mysql/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/mysql/install.inc,v retrieving revision 1.3 diff -u -p -r1.3 install.inc --- includes/database/mysql/install.inc 27 Jul 2009 19:42:56 -0000 1.3 +++ includes/database/mysql/install.inc 24 Jul 2010 16:45:57 -0000 @@ -12,7 +12,7 @@ class DatabaseTasks_mysql extends DatabaseTasks { protected $pdoDriver = 'mysql'; public function name() { - return 'MySQL'; + return 'MySQL/MariaDB or equivalent'; } }