diff options
Diffstat (limited to 'includes/install.mysqli.inc')
| -rw-r--r-- | includes/install.mysqli.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc index 111a4a936..f1eb23558 100644 --- a/includes/install.mysqli.inc +++ b/includes/install.mysqli.inc @@ -36,13 +36,13 @@ function drupal_test_mysqli($url, &$success) { $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.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. 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.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); return FALSE; } // Test selecting the database. if (mysqli_connect_errno() > 0) { - drupal_set_message(st('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct database name?</li><li>Are you sure the database exists?</li><li>Are you sure the username has permission to access the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. 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 select your database on your MySQL database server, which means the connection username and password are valid, but there is a problem accessing your data. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct database name?</li><li>Are you sure the database exists?</li><li>Are you sure the username has permission to access the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); return FALSE; } @@ -52,7 +52,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'CREATE TABLE drupal_install_test (id int NULL)'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.<ul><li>Are you sure the configured username has the necessary MySQL permissions to create tables in the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.<ul><li>Are you sure the configured username has the necessary MySQL permissions to create tables in the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); return FALSE; } $err = FALSE; @@ -63,7 +63,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'INSERT INTO drupal_install_test (id) VALUES (1)'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -74,7 +74,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'UPDATE drupal_install_test SET id = 2'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -85,7 +85,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'LOCK TABLES drupal_install_test WRITE'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -96,7 +96,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'UNLOCK TABLES'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -107,7 +107,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'DELETE FROM drupal_install_test'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -118,7 +118,7 @@ function drupal_test_mysqli($url, &$success) { $query = 'DROP TABLE drupal_install_test'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { |