~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
94
94
#include <fttypes.h>
95
95
#include <ft-flusher.h>
96
96
#include <ft-internal.h>
97
 
#include "ft.h"
 
97
#include <ft.h>
 
98
#include <util/context.h>
98
99
 
99
100
static void
100
101
ftnode_get_key_and_fullhash(
252
253
            bfe->child_to_read
253
254
            );
254
255
        if (needs_ancestors_messages) {
 
256
            toku::context apply_messages_ctx(CTX_MESSAGE_APPLICATION);
 
257
 
255
258
            toku_unpin_ftnode_read_only(brt->ft, node);
256
259
            int rr = toku_cachetable_get_and_pin_nonblocking_batched(
257
260
                    brt->ft->cf,