Index: install.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.mysql.inc,v
retrieving revision 1.5
diff -u -r1.5 install.mysql.inc
--- install.mysql.inc 6 Aug 2007 10:28:42 -0000 1.5
+++ install.mysql.inc 21 Oct 2007 23:38:14 -0000
@@ -41,7 +41,7 @@
// Test connecting to the database.
$connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2);
if (!$connection) {
- drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.
- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error');
+ drupal_set_message(st('Failed to connect to your MySQL database server. MySQL reports the following message: %error.- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error');
return FALSE;
}
Index: install.mysqli.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.mysqli.inc,v
retrieving revision 1.8
diff -u -r1.8 install.mysqli.inc
--- install.mysqli.inc 2 Sep 2007 12:50:55 -0000 1.8
+++ install.mysqli.inc 21 Oct 2007 23:38:14 -0000
@@ -36,7 +36,7 @@
$connection = mysqli_init();
@mysqli_real_connect($connection, $url['host'], $url['user'], $url['pass'], substr($url['path'], 1), $url['port'], NULL, MYSQLI_CLIENT_FOUND_ROWS);
if (mysqli_connect_errno() >= 2000 || mysqli_connect_errno() == 1045) {
- drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error');
+ drupal_set_message(st('Failed to connect to your MySQL database server. MySQL reports the following message: %error.- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error');
return FALSE;
}
Index: install.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.pgsql.inc,v
retrieving revision 1.5
diff -u -r1.5 install.pgsql.inc
--- install.pgsql.inc 19 Oct 2007 15:02:15 -0000 1.5
+++ install.pgsql.inc 21 Oct 2007 23:38:14 -0000
@@ -48,7 +48,7 @@
// Test connecting to the database.
$connection = @pg_connect($conn_string);
if (!$connection) {
- drupal_set_message(st('Failure to connect to your PostgreSQL database server. PostgreSQL reports the following message: %error.- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
- Are you sure you typed the correct database name?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => 'Connection failed. See log file for failure reason')), 'error');
+ drupal_set_message(st('Failed to connect to your PostgreSQL database server. PostgreSQL reports the following message: %error.- Are you sure you have the correct username and password?
- Are you sure that you have typed the correct database hostname?
- Are you sure that the database server is running?
- Are you sure you typed the correct database name?
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => 'Connection failed. See log file for failure reason')), 'error');
return FALSE;
}