#193580 by chx: given recent improvements, Drupal does not require CREATE TEMPORARY TABLE and LOCK TABLES permissions, so do not check on install and do not advise people giving these rights

3 files changed, 3 insertions, 48 deletions

diff --git a/INSTALL.mysql.txt b/INSTALL.mysql.txt
index 781e7b26f..ae50ebb40 100644
--- a/INSTALL.mysql.txt
+++ b/INSTALL.mysql.txt
@@ -21,8 +21,7 @@ initial database files. Next you must login and set the access database rights:
 Again, you will be asked for the 'username' database password. At the MySQL
 prompt, enter following command:
 
-  GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE
-  TEMPORARY TABLES, LOCK TABLES
+  GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER
   ON databasename.*
   TO 'username'@'localhost' IDENTIFIED BY 'password';
 
diff --git a/includes/install.mysql.inc b/includes/install.mysql.inc
index 2b111f482..a6ebca079 100644
--- a/includes/install.mysql.inc
+++ b/includes/install.mysql.inc
@@ -86,28 +86,6 @@ function drupal_test_mysql($url, &$success) {
     $success[] = 'UPDATE';
   }
 
-  // Test LOCK.
-  $query = 'LOCK TABLES drupal_install_test WRITE';
-  $result = mysql_query($query);
-  if ($error = mysql_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 {
-    $success[] = 'LOCK';
-  }
-
-  // Test UNLOCK.
-  $query = 'UNLOCK TABLES';
-  $result = mysql_query($query);
-  if ($error = mysql_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 {
-    $success[] = 'UNLOCK';
-  }
-
   // Test DELETE.
   $query = 'DELETE FROM drupal_install_test';
   $result = mysql_query($query);
@@ -136,4 +114,4 @@ function drupal_test_mysql($url, &$success) {
 
   mysql_close($connection);
   return TRUE;
-}
\ No newline at end of file
+}
diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc
index f1eb23558..1a73ad292 100644
--- a/includes/install.mysqli.inc
+++ b/includes/install.mysqli.inc
@@ -81,28 +81,6 @@ function drupal_test_mysqli($url, &$success) {
     $success[] = 'UPDATE';
   }
 
-  // Test LOCK.
-  $query = 'LOCK TABLES drupal_install_test WRITE';
-  $result = mysqli_query($connection, $query);
-  if ($error = mysqli_error($connection)) {
-    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 {
-    $success[] = 'LOCK';
-  }
-
-  // Test UNLOCK.
-  $query = 'UNLOCK TABLES';
-  $result = mysqli_query($connection, $query);
-  if ($error = mysqli_error($connection)) {
-    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 {
-    $success[] = 'UNLOCK';
-  }
-
   // Test DELETE.
   $query = 'DELETE FROM drupal_install_test';
   $result = mysqli_query($connection, $query);
@@ -131,4 +109,4 @@ function drupal_test_mysqli($url, &$success) {
 
   mysqli_close($connection);
   return TRUE;
-}
\ No newline at end of file
+}