Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle

Conflicts:
	lib/db/caches.php

diff --cc lang/en/cache.php
index a8005ae,1d21dd0..327da65
--- 1/lang/en/cache.php
--- 2/lang/en/cache.php
+++ b/lang/en/cache.php
@@@ -60,9 -60,9 +60,10 @@@ $string['cachedef_plugin_manager'] = 'P
  $string['cachedef_questiondata'] = 'Question definitions';
  $string['cachedef_repositories'] = 'Repositories instances data';
  $string['cachedef_search_results'] = 'Search results user data';
 +$string['cachedef_grade_categories'] = 'Grade category queries';
  $string['cachedef_string'] = 'Language string cache';
  $string['cachedef_tags'] = 'Tags collections and areas';
+ $string['cachedef_temp_tables'] = 'Temporary tables cache';
  $string['cachedef_userselections'] = 'Data used to persist user selections throughout Moodle';
  $string['cachedef_yuimodules'] = 'YUI Module definitions';
  $string['cachelock_file_default'] = 'Default file locking';

diff --cc lib/db/caches.php
index f9b0bd6,c4cddf3..f5bbb40
--- 1/lib/db/caches.php
--- 2/lib/db/caches.php
+++ b/lib/db/caches.php
@@@ -271,9 -271,10 +271,15 @@@ $definitions = array
          'staticaccelerationsize' => 3
      ),
  
 -    ),
 -
 +    // Grade categories. Stored at request level as invalidation is very aggressive.
 +    'grade_categories' => array(
 +        'mode' => cache_store::MODE_REQUEST,
 +        'simplekeys' => true,
 +    ),
++
+     // Store temporary tables information.
+     'temp_tables' => array(
+         'mode' => cache_store::MODE_REQUEST,
+         'simplekeys' => true
++    )
  );