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

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc

  • 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:
144
144
do_hot_optimize(FT_HANDLE t, CACHETABLE UU(ct), void *extra)
145
145
{
146
146
    float *CAST_FROM_VOIDP(fraction, extra);
147
 
    int r = toku_ft_hot_optimize(t, NULL, NULL, progress, extra);
 
147
    uint64_t loops_run = 0;
 
148
    int r = toku_ft_hot_optimize(t, NULL, NULL, progress, extra, &loops_run);
148
149
    if (*fraction < 1.0) {
149
150
        CKERR2(r, 1);
150
151
    } else {