← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/82_extend_default_test_timeout_for_tokudb.diff

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/82_extend_default_test_timeout_for_tokudb.diff
 
1
--- old/mysql-test/CMakeLists.txt       2014-02-12 17:55:23.469136898 +0200
 
2
+++ new/mysql-test/CMakeLists.txt       2014-02-12 17:54:07.471406742 +0200
 
3
@@ -64,7 +64,7 @@
 
4
 ENDIF()
 
5
 
 
6
 
 
7
+SET(MTR_FORCE perl ./mysql-test-run.pl --force --testcase-timeout=30 --suite-timeout=540)
 
8
-SET(MTR_FORCE perl ./mysql-test-run.pl --force)
 
9
 IF(EXISTS ${CMAKE_SOURCE_DIR}/mysql-test/suite/nist)
 
10
   SET(TEST_NIST ${MTR_FORCE} --comment=nist suite=nist ${EXP} && 
 
11
     ${MTR_FORCE} --comment=nist --force --suite=nist+ps ${EXP})