← 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/le-cursor-walk.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-walk.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:
91
91
// test the LE_CURSOR next function
92
92
 
93
93
 
94
 
#include "checkpoint.h"
 
94
#include "cachetable/checkpoint.h"
95
95
#include "le-cursor.h"
96
96
#include "test.h"
97
97
#include <unistd.h>
98
98
 
99
99
static TOKUTXN const null_txn = 0;
100
 
static DB * const null_db = 0;
101
100
 
102
101
static int
103
 
get_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen UU(), bytevec val UU(), void *extra, bool lock_only) {
 
102
get_next_callback(uint32_t keylen, const void *key, uint32_t vallen UU(), const void *val UU(), void *extra, bool lock_only) {
104
103
    DBT *CAST_FROM_VOIDP(key_dbt, extra);
105
104
    if (!lock_only) {
106
105
        toku_dbt_set(keylen, key, key_dbt, NULL);
192
191
    int error;
193
192
 
194
193
    CACHETABLE ct = NULL;
195
 
    toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER);
 
194
    toku_cachetable_create(&ct, 0, ZERO_LSN, nullptr);
196
195
 
197
196
    FT_HANDLE ft = NULL;
198
197
    error = toku_open_ft_handle(fname, 1, &ft, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare);