diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-08 04:45:36 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-08 04:45:36 +0000 |
| commit | 1632855a9f72a01edf9e8fea44b734cdbb0086a7 (patch) | |
| tree | f2d724a56d162088fd5a82eed080513c97df2d08 /includes/database/mysql/database.inc | |
| parent | 6159c302e13aac5a6a1152064fda236edd9f04d0 (diff) | |
| download | brdo-1632855a9f72a01edf9e8fea44b734cdbb0086a7.tar.gz brdo-1632855a9f72a01edf9e8fea44b734cdbb0086a7.tar.bz2 | |
#325895 by chx and hswong3i: Fix queryTemporary and add test case.
Diffstat (limited to 'includes/database/mysql/database.inc')
| -rw-r--r-- | includes/database/mysql/database.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index 7cf4f204c..d68951890 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -46,10 +46,8 @@ class DatabaseConnection_mysql extends DatabaseConnection { return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options); } - 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); + 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 driver() { |