← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/xtradb/os/os0file.c

  • 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:
storage/xtradb/os/os0file.c
1658
1658
                }
1659
1659
        }
1660
1660
 
1661
 
        if (srv_use_atomic_writes && type == OS_DATA_FILE && 
1662
 
                os_file_set_atomic_writes(file, name)) {
 
1661
        if (srv_use_atomic_writes && type == OS_DATA_FILE &&
 
1662
                !os_file_set_atomic_writes(file, name)) {
1663
1663
                         CloseHandle(file);
1664
1664
                        *success = FALSE;
1665
1665
                        file = INVALID_HANDLE_VALUE;
1786
1786
#endif /* USE_FILE_LOCK */
1787
1787
 
1788
1788
        if (srv_use_atomic_writes && type == OS_DATA_FILE
1789
 
            && os_file_set_atomic_writes(name, file)) {
 
1789
            && !os_file_set_atomic_writes(name, file)) {
1790
1790
 
1791
1791
                *success = FALSE;
1792
1792
                close(file);
3773
3773
        ut_free(os_aio_segment_wait_events);
3774
3774
        os_aio_segment_wait_events = 0;
3775
3775
        os_aio_n_segments = 0;
 
3776
#ifdef _WIN32
 
3777
        completion_port = 0;
 
3778
        read_completion_port = 0;
 
3779
#endif
3776
3780
}
3777
3781
 
3778
3782
#ifdef WIN_ASYNC_IO