← 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/ft/tests/test_rightmost_leaf_seqinsert_heuristic.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/ft/tests/test_rightmost_leaf_seqinsert_heuristic.cc
29
29
 
30
30
COPYRIGHT NOTICE:
31
31
 
32
 
  TokuDB, Tokutek Fractal Tree Indexing Library.
 
32
  TokuFT, Tokutek Fractal Tree Indexing Library.
33
33
  Copyright (C) 2007-2014 Tokutek, Inc.
34
34
 
35
35
DISCLAIMER:
90
90
 
91
91
#include "test.h"
92
92
 
93
 
#include <ft/ybt.h>
 
93
#include <util/dbt.h>
94
94
#include <ft/ft-cachetable-wrappers.h>
95
95
 
96
96
// Each FT maintains a sequential insert heuristic to determine if its
110
110
    
111
111
    FT_HANDLE ft_handle;
112
112
    CACHETABLE ct;
113
 
    toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER);
 
113
    toku_cachetable_create(&ct, 0, ZERO_LSN, nullptr);
114
114
    r = toku_open_ft_handle(name, 1, &ft_handle,
115
115
                            4*1024*1024, 64*1024,
116
116
                            TOKU_DEFAULT_COMPRESSION_METHOD, ct, NULL,