~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.h

  • 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:
130
130
 
131
131
void
132
132
toku_ft_init(
133
 
    FT h,
 
133
    FT ft,
134
134
    BLOCKNUM root_blocknum_on_disk,
135
135
    LSN checkpoint_lsn,
136
136
    TXNID root_xid_that_created,
137
137
    uint32_t target_nodesize,
138
138
    uint32_t target_basementnodesize,
139
 
    enum toku_compression_method compression_method
 
139
    enum toku_compression_method compression_method,
 
140
    uint32_t fanout
140
141
    );
141
142
 
142
143
int toku_dictionary_redirect_abort(FT old_h, FT new_h, TOKUTXN txn) __attribute__ ((warn_unused_result));
186
187
void toku_ft_get_basementnodesize(FT ft, unsigned int *basementnodesize);
187
188
void toku_ft_set_compression_method(FT ft, enum toku_compression_method method);
188
189
void toku_ft_get_compression_method(FT ft, enum toku_compression_method *methodp);
 
190
void toku_ft_set_fanout(FT ft, unsigned int fanout);
 
191
void toku_ft_get_fanout(FT ft, unsigned int *fanout);
189
192
void toku_node_save_ct_pair(CACHEKEY UU(key), void *value_data, PAIR p);
190
193
 
191
194
// mark the ft as a blackhole. any message injections will be a no op.