← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mariadb-5.5/vivid-proposed

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/src/loader.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-11-14 21:04:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20141114210424-xlyna0ozl11647o5
Tags: 5.5.40-0ubuntu0.14.10.1
https://launchpad.net/bugs/1391676
* SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
  - CVE-2014-6507
  - CVE-2014-6491
  - CVE-2014-6500
  - CVE-2014-6469
  - CVE-2014-6555
  - CVE-2014-6559
  - CVE-2014-6494
  - CVE-2014-6496
  - CVE-2014-6464
* Add bsdutils as mariadb-server dependency like upstream does in 5.5.40.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/tokudb/ft-index/src/loader.cc
28
28
 
29
29
COPYRIGHT NOTICE:
30
30
 
31
 
  TokuDB, Tokutek Fractal Tree Indexing Library.
 
31
  TokuFT, Tokutek Fractal Tree Indexing Library.
32
32
  Copyright (C) 2007-2013 Tokutek, Inc.
33
33
 
34
34
DISCLAIMER:
93
93
 *   The loader
94
94
 */
95
95
 
 
96
#include <config.h>
 
97
 
96
98
#include <toku_portability.h>
97
99
#include <portability/toku_atomic.h>
98
100
#include <stdio.h>
99
101
#include <string.h>
100
102
 
101
103
#include <ft/ft.h>
102
 
#include <ft/ftloader.h>
103
 
#include <ft/checkpoint.h>
 
104
#include <ft/loader/loader.h>
 
105
#include <ft/cachetable/checkpoint.h>
104
106
 
105
107
#include "ydb-internal.h"
106
108
#include "ydb_db.h"
119
121
 
120
122
static LOADER_STATUS_S loader_status;
121
123
 
122
 
#define STATUS_INIT(k,c,t,l,inc) TOKUDB_STATUS_INIT(loader_status, k, c, t, "loader: " l, inc)
 
124
#define STATUS_INIT(k,c,t,l,inc) TOKUFT_STATUS_INIT(loader_status, k, c, t, "loader: " l, inc)
123
125
 
124
126
static void
125
127
status_init(void) {