moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39390' of git://github.com/stronk7/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-04-29 14:12:37 +01:00
commit 1f65889ab3
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/dml/moodle_database.php
View file

@ -66,8 +66,6 @@ abstract class moodle_database {
protected $database_manager; protected $database_manager;
/** @var moodle_temptables temptables manager to provide cross-db support for temp tables. */ /** @var moodle_temptables temptables manager to provide cross-db support for temp tables. */
protected $temptables; protected $temptables;
/** @var array Cache of column info. */
protected $columns = array(); // I wish we had a shared memory cache for this :-(
/** @var array Cache of table info. */ /** @var array Cache of table info. */
protected $tables = null; protected $tables = null;
@ -356,7 +354,6 @@ abstract class moodle_database {
$this->database_manager->dispose(); $this->database_manager->dispose();
$this->database_manager = null; $this->database_manager = null;
} }
$this->columns = array();
$this->tables = null; $this->tables = null;
} }
@ -945,7 +942,6 @@ abstract class moodle_database {
* @return void * @return void
*/ */
public function reset_caches() { public function reset_caches() {
$this->columns = array();
$this->tables = null; $this->tables = null;
// Purge MUC as well // Purge MUC as well
$identifiers = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash()); $identifiers = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());

3
lib/upgrade.txt
View file

@ -3,6 +3,9 @@ information provided here is intended especially for developers.
=== 2.5 === === 2.5 ===
* The database drivers (moodle_database and subclasses) aren't using anymore the ::columns property
for caching database metadata. MUC (databasemeta) is used instead. Any custom DB driver should
apply for that change.
* The cron output has been changed to include time and memory usage (see cron_trace_time_and_memory()), * The cron output has been changed to include time and memory usage (see cron_trace_time_and_memory()),
so any custom utility relying on the old output may require modification. so any custom utility relying on the old output may require modification.
* Function get_max_file_sizes now returns an option for (for example) "Course limit (500MB)" or * Function get_max_file_sizes now returns an option for (for example) "Course limit (500MB)" or