#325895 by chx: Fix queryTemporary, which was missing a required argument.

2 files changed, 5 insertions, 2 deletions

diff --git a/includes/database/database.inc b/includes/database/database.inc
index e5fafd16e..7b66f2441 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -631,11 +631,14 @@ abstract class DatabaseConnection extends PDO {
    * @param $tablename
    *   The name of the temporary table to select into. This name will not be
    *   prefixed as there is no risk of collision.
+   * @param $options
+   *   An associative array of options to control how the query is run.  See
+   *   the documentation for DatabaseConnection::defaultOptions() for details.
    * @return
    *   A database query result resource, or FALSE if the query was not executed
    *   correctly.
    */
-   abstract function queryTemporary($query, Array $args, $tablename);
+   abstract function queryTemporary($query, Array $args, $tablename, $options = array());
 
   /**
    * Returns the type of database driver.
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 26fe17247..7cf4f204c 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -46,7 +46,7 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
   }
 
-  public function queryTemporary($query, Array $args, $tablename) {
+  public function queryTemporary($query, Array $args, $tablename, $options = array()) {
     $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' Engine=HEAP SELECT', $this->prefixTables($query));
 
     return $this->query($query, $args, $options);