~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/src/ydb-internal.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:
182
182
    int datadir_lockfd;
183
183
    int logdir_lockfd;
184
184
    int tmpdir_lockfd;
185
 
    uint64_t loader_memory_size;
 
185
    uint64_t (*get_loader_memory_size_callback)(void);
 
186
    uint64_t default_lock_timeout_msec;
 
187
    uint64_t (*get_lock_timeout_callback)(uint64_t default_lock_timeout_msec);
 
188
    uint64_t default_killed_time_msec;
 
189
    uint64_t (*get_killed_time_callback)(uint64_t default_killed_time_msec);
 
190
    int (*killed_callback)(void);
186
191
};
187
192
 
188
193
// test-only environment function for running lock escalation