← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.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
http://bugs.debian.org/745330
* 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:
storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc
148
148
 
149
149
    r = db_env_create(&env, 0); CKERR(r);
150
150
    r = env->open(env, TOKU_TEST_FILENAME, env_flags, 0755); CKERR(r);
151
 
    r = env->set_lock_timeout(env, 4000);
 
151
    r = env->set_lock_timeout(env, 4000, nullptr);
152
152
 
153
153
    r = db_create(&db, env, 0); CKERR(r);
154
154
    r = db->open(db, NULL, dname, NULL, DB_BTREE, DB_CREATE, 0777); CKERR(r);