← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/ft/tests/le-cursor-right.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/le-cursor-right.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-2013 Tokutek, Inc.
34
34
 
35
35
DISCLAIMER:
94
94
// - LE_CURSOR somewhere else
95
95
 
96
96
 
97
 
#include "checkpoint.h"
 
97
#include "cachetable/checkpoint.h"
98
98
#include "le-cursor.h"
99
99
#include "test.h"
100
100
 
101
101
static TOKUTXN const null_txn = 0;
102
 
static DB * const null_db = 0;
103
102
 
104
103
static int
105
 
get_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen UU(), bytevec val UU(), void *extra, bool lock_only) {
 
104
get_next_callback(uint32_t keylen, const void *key, uint32_t vallen UU(), const void *val UU(), void *extra, bool lock_only) {
106
105
    DBT *CAST_FROM_VOIDP(key_dbt, extra);
107
106
    if (!lock_only) {
108
107
        toku_dbt_set(keylen, key, key_dbt, NULL);
196
195
    int error;
197
196
 
198
197
    CACHETABLE ct = NULL;
199
 
    toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER);
 
198
    toku_cachetable_create(&ct, 0, ZERO_LSN, nullptr);
200
199
 
201
200
    FT_HANDLE ft = NULL;
202
201
    error = toku_open_ft_handle(fname, 1, &ft, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare);
230
229
    int error;
231
230
 
232
231
    CACHETABLE ct = NULL;
233
 
    toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER);
 
232
    toku_cachetable_create(&ct, 0, ZERO_LSN, nullptr);
234
233
 
235
234
    FT_HANDLE ft = NULL;
236
235
    error = toku_open_ft_handle(fname, 1, &ft, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare);
284
283
    int error;
285
284
 
286
285
    CACHETABLE ct = NULL;
287
 
    toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER);
 
286
    toku_cachetable_create(&ct, 0, ZERO_LSN, nullptr);
288
287
 
289
288
    FT_HANDLE ft = NULL;
290
289
    error = toku_open_ft_handle(fname, 1, &ft, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare);