Last commit made on 2014-02-20
Get this branch:
git clone -b ubuntu/trusty https://git.launchpad.net/ubuntu/+source/mysql-5.5
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

9a6b574... by Robie Basak on 2014-02-19

Import patches-unapplied version 5.5.35+dfsg-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 22f1b4dd809c06ae0a695e42733ec4bb3db0874e

New changelog entries:
  * Merge from Debian unstable.
  * Cherry-picks from Debian VCS for 5.5.35+dfsg-2, as it is held in Debian
    - d/mysql-server-5.5.mysql.init: Increase timeout to 30s.
    - d/mysql-server-5.5.postinst: Run mysql_install_db as mysql so tables are
      not created as root.
    - Re-add mysql-testsuite metapackage.
    - Add dep8 tests.
    - Move mailx from Recommends to Suggests.
    - Add AppArmor profile.
    - Write an error log and logrotate it.
    - Build with debug symbols.
    - Make innotop usable without installing Suggests.
    - d/control: Drop Nicholas from Uploaders, MIA.
    - Add missing misc:Depends to mysql-testsuite.
  * Remaining changes currently maintained only in the Ubuntu delta:
    - d/mysql-server-5.5.postrm: restore postrm debhelper token
      to get proper behaviors from dh_installinit and dh_apparmor. In
      discussion in Debian, but not yet committed.
    - Add upstart script. Blocked in Debian by the debhelper token issue above.
    - Add apport hook. Not relevant for Debian.
    - Split mysql-client-core-5.5 out from mysql-client-5.5. Submitted to
      Debian, but not yet accepted.

22f1b4d... by James Page <email address hidden> on 2014-01-18

Import patches-unapplied version 5.5.35+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f191e7b0d65071615de326bc06425e3328c23bc7

New changelog entries:
  [ Clint Byrum ]
  * Drop creation of insecure database permissions (Closes: #732306):
    - d/p/33_scripts__mysql_create_system_tables__no_test.patch,
      d/p/50_mysql-test__db_test.patch: Restored from mysql-5.1
      package, inadvertently dropped in 5.5 transition. This
      removes the global anonymous access to the database which
      is a security concern.
  [ James Page ]
  * New upstream release:
    - d/p/fix-racey-rpltests.patch: Dropped - no longer required.
    - d/p/50_mysql-test__db_test.patch: Add extra permissions to
      mysql-run-tests.pl for test_% accounts, fixing failing tests.
    - d/p/*: Refreshed patches.
      - 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
  * Sync changes from NMU 5.5.33+dfsg-0+wheezy1:
    - d/NEWS: Add NEWS file to document changes needed to existing databases
      to drop insecure database permissions.
    - SECURITY UPDATE: Insecure creation of the credential file debian.cnf.
      - d/mysql-server-5.5.postinst: Set umask to 066 before creating
        debian.cnf file (Closes: #711600).
      - CVE-2013-2162
    - d/copyright: Update copyright years for upstream files.
  * d/control: Update VCS field for new git location.
  * d/control: Add myself to Uploaders.
  * d/*: Wrap and sort.
  * d/control: Bumped Standards-Version, no changes.

f191e7b... by Clint Byrum <email address hidden> on 2013-09-26

Import patches-unapplied version 5.5.33+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8b5aca008c90adab08c7c98a2d4322cceca4d8a8

New changelog entries:
  * d/rules, d/control: Remove gcc-4.4 dependency and disable X86
    assembly in taocrypt. (Closes: #707280) (Closes: #678252)
  * d/patches/fix-mips64el-ftbfs.patch: Fix FTBFS on mips64el.
    (Closes: #719196) Thanks YunQuiang Su.
  * New upstream release.
    SECURITY UPDATE: CVE-2013-1861 CVE-2013-3783 CVE-2013-3793
    CVE-2013-3804 CVE-2013-3802 CVE-2013-3809 CVE-2013-3812
    (Closes: #706715) (Closes: #712730)
  * d/patches/work_around_failing_rpl_deadlock.patch: Test suite
    changes upstream have left some connections active. This
    patch fixes that. Thanks Kristian Nielsen!
  * d/patches/fix-racey-rpltests.patch: Fix from Oracle for failing

8b5aca0... by Clint Byrum on 2013-05-06

Import patches-unapplied version 5.5.31+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b208c3e37642b0e890764678b5416476dba36e1f

New changelog entries:
  * New upstream release.
    SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
    CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
    CVE-2013-2391 CVE-2013-1502
    - Patches refreshed.
    - d/p/yassl.patch - dropped, applied upstream
    - d/p/debian-mdev382-fixup.patch: dropped, fixed upstream.

b208c3e... by Michael on 2013-04-14

Import patches-unapplied version 5.5.30+dfsg-1.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 367296d5a14ae8a4dc380e605551369363896f04

New changelog entries:
  * Non-maintainer upload.
  * d/p/yassl.patch - patch for CVE-2013-0169 (Closes: #699886)

367296d... by Clint Byrum on 2013-03-24

Import patches-unapplied version 5.5.30+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f9bc589c225881cd1ba63022f73ecc90c1fbc2bb

New changelog entries:
  * New upstream release.
  * d/p/debian-mdev382-fixup.patch - patch from MariaDB, Thanks
    Kristian Nielsen. resolves CVE-2012-4414 (Closes: #698068)

f9bc589... by Nicholas Bamber on 2013-01-11

Import patches-unapplied version 5.5.29+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8fcdd42523e51dddb9158770315fa7134a7a5525

New changelog entries:
  [ Clint Byrum ]
  * d/mysql-server-5.5.postinst: Patch from Alex Bligh to fix privilege
    regression that was introduced in the switch from 5.1 to 5.5.
    (Closes: #692871)
  * New upstream release. (Closes: #695001) Refreshed patches.

8fcdd42... by Nicholas Bamber on 2012-10-28

Import patches-unapplied version 5.5.28+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: baf5c99456815b57a1b4da00301908034a4f4af4

New changelog entries:
  * New upstream release (resolves CVE-2012-3163, CVE-2012-3158, CVE-2012-3177,
    CVE-2012-3147, CVE-2012-3166, CVE-2012-3173, CVE-2012-3144, CVE-2012-3150,
    CVE-2012-3180, CVE-2012-3149, CVE-2012-3156, CVE-2012-3167, CVE-2012-3197,
    CVE-2012-3160) (Closes: #690778)
  * Removed debian/patches/73_mysqlcheck_tests.patch and
    debian/patches/2_main_openssl_1.patch as they did not apply cleanly and did
    not seem to be required any longer
  * Refreshed patches and updated headers:
    - debian/patches/73_mysqlcheck_tests.patch
    - debian/patches/94_spelling.patch
    - debian/patches/70_mysql_va_list.patch

baf5c99... by Nicholas Bamber on 2012-09-22

Import patches-unapplied version 5.5.24+dfsg-9 to debian/sid

Imported using git-ubuntu import.

Changelog parent: bb3edce5173fe96a019cb0c0497e37e1287a21a8

New changelog entries:
  * Danish debconf translation (Closes: #684566)
  * Turkish debconf translation (Closes: #688294)
  * Loosened versioned dependency between mysql-server-5.5 and
    mysql-server-core-5.5, hopefully (Closes: #686803)
  * Restored zlib1g-dev (>= 1:1.1.3-5) as a build dependency
    and made the use of system libz explicit in debian/rules

bb3edce... by Nicholas Bamber on 2012-09-04

Import patches-unapplied version 5.5.24+dfsg-8 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6074b11fe4da255a13b3c7b8ba5e190ee53b95cf

New changelog entries:
  * Updated debian/copyright after analysis from development version
    of license-reconcile (Closes: #682311)
    - 'Comments' field to corrected to 'Comment'
    - Missing paragraphs for '*', 'debian/*' and for the mysqlreport
      and innotop scripts
    - Removed duplicate entries from Files listings
    - Added clause for files licensed under BSD (4-clause)
    - Clarified 'BSD (3 clause) GPL-2' as being 'BSD (3 clause) or GPL-2'
  * Updated Slovak debconf translation (Closes: #684644)