Merge branch 'MDL-51374_multiple-connections' of git://github.com/dmonllao/moodle

2016-03-17 10:50:06 +08:00
parent 6f1cd967b5 a696bb9ebd
commit 922c611ff4
1 changed files with 3 additions and 1 deletions
@@ -342,7 +342,9 @@ abstract class moodle_database {
     * @return cache_application The temp_tables cachestore to complete operations on.
     */
    protected function get_temp_tables_cache() {
-        return cache::make('core', 'temp_tables');
+        // Using connection data to prevent collisions when using the same temp table name with different db connections.
+        $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
+        return cache::make('core', 'temp_tables', $properties);
    }

    /**