Last commit made on 2012-06-14
Get this branch:
git clone -b debian/experimental 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

7ca76d4... by Nicholas Bamber on 2012-06-13

Import patches-unapplied version 5.5.25+dfsg-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 13bafa201c42995b32616fbe2be13bc4ed1238f9

New changelog entries:
  * Fixing regular expression in tests to guard against build path containing
    the '+' symbol (Closes: #674210)
  * Setting the gcc/g++ version to 4.5 on i386 platforms (cf. #674267)
  * Removed main_openssl_1 patch
  * Set SYSTEM_TYPE according to GNU Build System
  * In an effort to get a better handle on test coverage, made test failures
    on kfreebsd-i386 fatal and re-enabled full tests on hurd, skipped certain
    tests on kfreebsd and changed disabled tests to selectively skipped tests
  * Updated French translation (Closes: #674025)
  * Updated Dutch translation (Closes: #674124)
  * Updated Russian translation (Closes: #674189)
  * Updated Portuguese translation (Closes: #674953)
  * Updated Swedish translation (Closes: #675108)
  * Updated German translation (Closes: #675766)
  * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
    and mysql-server-5.5 off dh_movefiles
  * Removed dh_movefiles override
  * Rewrote libmysqlclient_r linking stuff to generate
    ephemeral dh_link files so that the hack is more comprehensible
  * Stopped attempts to install non-existent files for libmysqlclient-dev
    and mysql-server-5.5
  * Added --fail-missing to dh_install to catch executables not being installed
  * Distributed unused resources amongst packages appropriately
  * Added fixes to mop up various permissions issues in auto-install rule
  * Enhanced documentation around the source package and the reasons for it
    being arch:any
  * Removed source cruft: debian/additions/*.1 (apart from mysqlreport.1)
  * Restored zlib1g-dev build dependency pending further investigation
  * Removed the numerical prefix from the patch files
  * Applied fix-mysqldump-test.patch from Ubuntu
  * Applied mysql-testsuite and mysql-client-core-5.5 package definitions
    from Ubuntu
  * Located and installed upstream changelog
  * Removed doxygen-latex, ghostscript as build dependency
    as these were needed only for the NDB docs
  * Added lintian overrides
    - spelling false positive: yuR
    - long lines in man pages that cannot be reformatted
    - missing symbols file (cf. #590905)
  * Added patch for hyphen/minus sign confusion
  * Dropped mailx to Suggests clause (Closes: #535496)
  * New upstream source
  * Refreshed patches
  * Standardized debian/watch and get-orig-source and made DFSG exclusion
    of Docs/mysql.info explicit (Closes: #673528)
  * Revert having libssl-dev as a build dependency and changed
    WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
    and (Closes: #673865)
  * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
    and bumped dependency in shlibs (Closes: #660686)
  * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
    so that client programs work without a co-located server (Closes: #672359)
  * Added versioned dependency on initscripts and revert /var/run
    to /run change (Closes: #676560)

13bafa2... by Nicholas Bamber on 2012-05-08

Import patches-unapplied version 5.5.23-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 279cfc3ab84919407ed7a61c428762abcfabb899

New changelog entries:
  * Stopped overriding the -j build parameter (Closes: #512964)
  * Stopped testing for /proc filesystem. It is no longer used
    for determining the number of CPUs.
  * Removed unnecessary build dependencies:
    - procps as it is required by cmake, cf. #96768
    - zlib1g newer version required by cmake
    - libtool obsoleted by cmake
    - file required by debhelper
  * Migrated libmysqld-dev, libmysqld-pic, libmysqlclient18 to using
    dh_install rather than dh_movefiles
  * Changed /var/run to /run as required by Debian Policy 3.9.3 (9.1.1)
  * Raised standards version to 3.9.3
  * Moved '-e' from shebang line to explicit 'set -e' as requested by lintian
  * Restored ha_example.so to mysql-server-5.5 but added Breaks/Replaces
    clauses (cf. LP: #912487) and (Closes: #666721)
  * Added additional Breaks/Replaces clauses for other clashes:
    - mysql-server-5.5 overwrites perror from mysql-client-5.1
    - mysql-server-core-5.5 overwrites my_print_defaults from mysql-client-5.1

279cfc3... by Nicholas Bamber on 2012-05-03

Import patches-unapplied version 5.5.23-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: fb82776108423c9b51cda7bdf71379ecf9e5f578

New changelog entries:
  * Added patch to test suite to accept socket paths less than 40
    characters long (Closes: #540153)
  * Disabled some more tests including some reported by Olaf van der Speck
  * Removed ha_example.so from mysql-server-5.5 install (Closes: #666721)
  * New upstream release: unspecified security issues CVE-2012-1697,
  * Added patch to correct spelling mistakes: preceeding -> preceding

fb82776... by Nicholas Bamber on 2012-04-28

Import patches-unapplied version 5.5.20-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: e679293cdb7df7977050375336d68afd525c9814

New changelog entries:
  [ Guillaume Plessis ]
  * d/rules: Enabling ARCHIVE, BLACKHOLE, and FEDERATED engines.
    (Closes: #649484)
  * d/rules: Turn off embedded libedit/readline.(Closes: #659566)
  [ Clint Byrum ]
  * New Upstream Release
  * d/copyright: rearranging to have standalone license paragraphs
    silencing lintian complaints about missing paragraphs.
  * d/mysql-client-5.5.files: add mysql_plugin
  * d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
    change compiler back to system default.
  * Sync changes back from Ubuntu:
      * d/control: need to also break mysql-client-core-5.1 and
        mysql-server-core-5.1 as well so that apt knows not to
        remove mysql-server/mysql-client.
      * d/control: convert mysql-server back to a meta-package
      * d/control: convert mysql-client back to a meta-package as well.
      * d/patches/72_fix_standalone_tests.patch: fix testsuite so it
        will run all tests when run from system /usr/lib/mysql-testsuite
        5.1 is removed from the archive.
      * d/control: mysql-common includes configuration items that only
        work on mysql 5.5, so adding Breaks: for client and server 5.1.
        This will make mysql-server-5.1 and mysql-client-5.1
        uninstallable which is actually desired.
      * d/patches/71_disable_rpl_tests.patch: disables this test until
        Ubuntu bug #894146 can be triaged.
      * d/mysql-client-5.5.files: add missing mysql_plugin
      * d/libmysqlcient18.files,libmysqlclient-dev.files,d/rules: re-add
        libmysqlclient_r. In hindsight, removing it was not a productive
      * d/libmysqlclient-dev.files: ship entire contents of include dir,
        some of these files are included internally by others in the
        main dir.
      * d/patches/70_mysql_va_list.patch: cherry pick patch from
        upstream bug tracker to fix ARM build failure. (LP: #700982)
  [ Nicholas Bamber ]
  * Added myself to Uploaders
  * Added libssl-dev as a build dependency and patched main.openssl_1 test
    so that it works with that library (Closes: #660799)
  * Added patch to provide cmake options for GNU/Hurd (Closes: #651002)
    and tweaked debian/rules so that only 'make test' is run on Hurd.
  * Tweaked debian/rules to make build logs verbose (Closes: #651003)
  * Refreshed patches - and added a new patch to disable a further flurry
    of failing tests
  * Switched on native AIO in linux builds (Closes: #659565)
  * Numerous minor changes to improve lintian cleanliness (Closes: #663354)
    - Added dh_lintian lines to debian/rules to ensure that lintian
      overrides take effect and removed old commented out lines
    - Clarified Hurd procps dependency in debian/control
    - Rewrote short description of the libmysqld-pic package to be more accurate
    - Depersonalised long description of mysql-client
    - Removed dependencies relating to mysql-common-4.1
    - Tightened Breaks clauses for mysql-common
    - Removed duplicate entry from Replaces clauses for mysql-server-core-5.5
    - Rexpressed Conflicts clause as versioned dependency
      for mysql-testsuite-5.5
    - Added DEP-5 header fields to two patches
    - Refreshed and commented all lintian overrides and added override
      concerning lack of upstream changelog to all packages
    - Cleaned up debian/copyright
      * upgraded to latest version of DEP-5
      * encoding issues
      * out of date FSF address
      * Updated License short name from "PD" to "public-domain"
  * Converted to short form debhelper rules
    - Renamed stamp files to end in '-stamp' so that they are cleaned up
      automatically by dh_clean
    - Removed commented out lines
    - Removed obsolete -DINSTALL_LIBDIR clause from pic build
    - Overrode dh_auto_install so that the rules only run once
    - Migrated mysql-source, mysql-testsuite, mysql-common from
    dh_movefiles to dh_install

e679293... by Clint Byrum on 2011-11-18

Import patches-unapplied version 5.5.17-4 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 9896f59092ca2260d04700e9b11151d833e19254

New changelog entries:
  * d/control: Pre-Depend on multiarch-support and misc:Pre-Depends.
    also bump debhelper Build-Dep for multiarch.
    d/compat: raise to 9 for multiarch support.
  [Clint Byrum]
  * d/control: setting Multi-Arch fields where appropriate.
  [Norbert Tretkowski]
  * Add Clint Byrum to Uploaders.
  * d/rules, d/control: Build with gcc 4.5 to avoid
    gcc 4.6 compile problems (see Debian bug number 630471)
  * d/rules, d/libmysqlclient*.files: changes to support
  * d/libmysqlclient18.files, d/libmysqlclient-dev.files: install
    symlinks to dev libraries properly and remove libmysqlclient_r
    since it is no longer needed. libmysqlclient is now perfectly
    thread safe. This will cause FTBFS but can be corrected by simply
    removing _r, and avoids uncomfortable problem of trying to properly
    mangle libmysqlclient_r symlinks to libmysqlclient.so.

9896f59... by Clint Byrum on 2011-11-08

Import patches-unapplied version 5.5.17-1 to debian/experimental

Imported using git-ubuntu import.