- Patch #349500 by Damien Tournoud et al: made db_query_temporary() generate its own temporary table names.

1 files changed, 4 insertions, 2 deletions

diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index b03c03ca3..281bcfa09 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -50,8 +50,10 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
   }
 
-  public function queryTemporary($query, array $args, $tablename, array $options = array()) {
-    return $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' Engine=MEMORY SELECT', $query), $args, $options);
+  public function queryTemporary($query, array $args, array $options = array()) {
+    $tablename = $this->generateTemporaryTableName();
+    $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE {' . $tablename . '} Engine=MEMORY SELECT', $query), $args, $options);
+    return $tablename;
   }
 
   public function driver() {