- Committer: Bazaar Package Importer
- Date: 2009-06-25 12:55:45 UTC
- mfrom: (1.1.2 upstream) (0.1.3 experimental)
- Revision ID: james.westby@ubuntu.com-20090625125545-m8ogs96zzsri74xe
* Merge from debian experimental (and 5.0 from main), remaining changes:
- debian/mysql-server-5.1.config:
+ ask for MySQL root password at priority high instead of medium so
that the password prompt is seen on a default install. (LP: #319843)
+ don't ask for root password when upgrading from a 5.0 install.
- debian/control:
+ Make libmysqlclient16-dev a transitional package depending on
libmysqlclient-dev.
+ Make libmysqlclient-dev conflict with libmysqlclient15-dev.
+ Don't build mysql-server, mysql-client, mysql-common and
libmysqlclient15-dev binary packages since they're still provided
by mysql-dfsg-5.0.
+ Make mysql-{client,server}-5.1 packages conflict and
replace mysql-{client,server}-5.0, but not provide
mysql-{client,server}.
+ Depend on a specific version of mysql-common rather than the src
version of mysql-dfsg-5.1 since mysql-common is currently part of
mysql-dfsg-5.0.
+ Lower mailx from a Recommends to a Suggests to avoid pulling in
a full MTA on all installs of mysql-server. (LP: #259477)
- debian/rules:
+ added -fno-strict-aliasing to CFLAGS to get around mysql testsuite
build failures.
+ install mysql-test and sql-bench to /usr/share/mysql/ rather than
/usr/.
- debian/additions/debian-start.inc.sh: support ANSI mode (LP: #310211)
- Add AppArmor profile:
- debian/apparmor-profile: apparmor profile.
- debian/rules, debian/mysql-server-5.0.files: install apparmor profile.
- debian/mysql-server-5.0.dirs: add etc/apparmor.d/force-complain
- debian/mysql-server-5.0.postrm: remove symlink in force-complain/ on
purge.
- debian/mysql-server-5.1.README.Debian: add apparmor documentation.
- debian/additions/my.cnf: Add warning about apparmor. (LP: #201799)
- debian/mysql-server-5.1.postinst: reload apparmor profiles.
- debian/additions/my.cnf: remove language option. Error message files are
located in a different directory in MySQL 5.0. Setting the language
option to use /usr/share/mysql/english breaks 5.0. Both 5.0 and 5.1
use a default value that works. (LP: #316974)
- debian/mysql-server-5.1.mysql.init:
+ Clearly indicate that we do not support running multiple instances
of mysqld by duplicating the init script.
(closes: #314785, #324834, #435165, #444216)
+ Properly parameterize all existing references to the mysql config
file (/etc/mysql/my.cnf).
- debian/mysql-server-5.0.postinst: Clear out the second password
when setting up mysql. (LP: #344816)
- mysql-server-core-5.1 package for files needed by Akonadi:
+ debian/control: create mysql-server-core-5.1 package.
+ debian/mysql-server-core-5.1.files, debian/mysql-server-5.1.files:
move core mysqld files to mysql-server-core-5.1 package.
- Don't package sql-bench and mysql-test file.
* Dropped changes:
- debian/patches/92_ssl_test_cert.dpatch: certificate expiration in
test suite (LP: #323755). Included upstream.
* Dropped from 5.0:
- apparmor profile:
- debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6. All version
of apparmor-profile (>hardy) are higher than this version.
- debian/mysql-server-5.0.preinst: create symlink for force-complain/
on pre-feisty upgrades, upgrades where apparmor-profiles profile is
unchanged (ie non-enforcing) and upgrades where the profile
doesn't exist. Support for pre-hardy upgrades is no longer needed.
* debian/mysql-server-5.1.postinst: fix debian-sys-maint user creation.
- debian/mysql-server-5.1.config:
+ ask for MySQL root password at priority high instead of medium so
that the password prompt is seen on a default install. (LP: #319843)
+ don't ask for root password when upgrading from a 5.0 install.
- debian/control:
+ Make libmysqlclient16-dev a transitional package depending on
libmysqlclient-dev.
+ Make libmysqlclient-dev conflict with libmysqlclient15-dev.
+ Don't build mysql-server, mysql-client, mysql-common and
libmysqlclient15-dev binary packages since they're still provided
by mysql-dfsg-5.0.
+ Make mysql-{client,server}-5.1 packages conflict and
replace mysql-{client,server}-5.0, but not provide
mysql-{client,server}.
+ Depend on a specific version of mysql-common rather than the src
version of mysql-dfsg-5.1 since mysql-common is currently part of
mysql-dfsg-5.0.
+ Lower mailx from a Recommends to a Suggests to avoid pulling in
a full MTA on all installs of mysql-server. (LP: #259477)
- debian/rules:
+ added -fno-strict-aliasing to CFLAGS to get around mysql testsuite
build failures.
+ install mysql-test and sql-bench to /usr/share/mysql/ rather than
/usr/.
- debian/additions/debian-start.inc.sh: support ANSI mode (LP: #310211)
- Add AppArmor profile:
- debian/apparmor-profile: apparmor profile.
- debian/rules, debian/mysql-server-5.0.files: install apparmor profile.
- debian/mysql-server-5.0.dirs: add etc/apparmor.d/force-complain
- debian/mysql-server-5.0.postrm: remove symlink in force-complain/ on
purge.
- debian/mysql-server-5.1.README.Debian: add apparmor documentation.
- debian/additions/my.cnf: Add warning about apparmor. (LP: #201799)
- debian/mysql-server-5.1.postinst: reload apparmor profiles.
- debian/additions/my.cnf: remove language option. Error message files are
located in a different directory in MySQL 5.0. Setting the language
option to use /usr/share/mysql/english breaks 5.0. Both 5.0 and 5.1
use a default value that works. (LP: #316974)
- debian/mysql-server-5.1.mysql.init:
+ Clearly indicate that we do not support running multiple instances
of mysqld by duplicating the init script.
(closes: #314785, #324834, #435165, #444216)
+ Properly parameterize all existing references to the mysql config
file (/etc/mysql/my.cnf).
- debian/mysql-server-5.0.postinst: Clear out the second password
when setting up mysql. (LP: #344816)
- mysql-server-core-5.1 package for files needed by Akonadi:
+ debian/control: create mysql-server-core-5.1 package.
+ debian/mysql-server-core-5.1.files, debian/mysql-server-5.1.files:
move core mysqld files to mysql-server-core-5.1 package.
- Don't package sql-bench and mysql-test file.
* Dropped changes:
- debian/patches/92_ssl_test_cert.dpatch: certificate expiration in
test suite (LP: #323755). Included upstream.
* Dropped from 5.0:
- apparmor profile:
- debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6. All version
of apparmor-profile (>hardy) are higher than this version.
- debian/mysql-server-5.0.preinst: create symlink for force-complain/
on pre-feisty upgrades, upgrades where apparmor-profiles profile is
unchanged (ie non-enforcing) and upgrades where the profile
doesn't exist. Support for pre-hardy upgrades is no longer needed.
* debian/mysql-server-5.1.postinst: fix debian-sys-maint user creation.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
comp_err.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.7 KB |
|
|
|
innochecksum.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.2 KB |
|
|
|
make_win_bin_dist.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.6 KB |
|
|
|
Makefile.am |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 1 KB |
|
|
|
Makefile.in |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 20.1 KB |
|
|
|
msql2mysql.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.3 KB |
|
|
|
my_print_defaults.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.4 KB |
|
|
|
myisam_ftdump.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.7 KB |
|
|
|
myisamchk.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 22.8 KB |
|
|
|
myisamlog.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.2 KB |
|
|
|
myisampack.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 15.5 KB |
|
|
|
mysql-stress-test.pl.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 6.1 KB |
|
|
|
mysql-test-run.pl.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 26.4 KB |
|
|
|
mysql.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 41.6 KB |
|
|
|
mysql.server.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.9 KB |
|
|
|
mysql_client_test.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4.5 KB |
|
|
|
mysql_client_test_embedded.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 29 bytes |
|
|
|
mysql_config.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4.2 KB |
|
|
|
mysql_convert_table_format.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.5 KB |
|
|
|
mysql_find_rows.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.9 KB |
|
|
|
mysql_fix_extensions.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.2 KB |
|
|
|
mysql_fix_privilege_tables.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4 KB |
|
|
|
mysql_install_db.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4.6 KB |
|
|
|
mysql_secure_installation.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.1 KB |
|
|
|
mysql_setpermission.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.3 KB |
|
|
|
mysql_tzinfo_to_sql.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.4 KB |
|
|
|
mysql_upgrade.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 6.4 KB |
|
|
|
mysql_waitpid.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.6 KB |
|
|
|
mysql_zap.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.6 KB |
|
|
|
mysqlaccess.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 5.6 KB |
|
|
|
mysqladmin.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 13 KB |
|
|
|
mysqlbinlog.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 31.3 KB |
|
|
|
mysqlbug.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.5 KB |
|
|
|
mysqlcheck.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 11.2 KB |
|
|
|
mysqld.8 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.7 KB |
|
|
|
mysqld_multi.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 13.4 KB |
|
|
|
mysqld_safe.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 13.6 KB |
|
|
|
mysqldump.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 35.1 KB |
|
|
|
mysqldumpslow.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4.1 KB |
|
|
|
mysqlhotcopy.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 6.3 KB |
|
|
|
mysqlimport.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 9 KB |
|
|
|
mysqlman.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 675 bytes |
|
|
|
mysqlmanager.8 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 44 KB |
|
|
|
mysqlshow.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 6.9 KB |
|
|
|
mysqlslap.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 13.3 KB |
|
|
|
mysqltest.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 9.8 KB |
|
|
|
mysqltest_embedded.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 21 bytes |
|
|
|
ndb_config.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 7.2 KB |
|
|
|
ndb_cpcd.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 1.8 KB |
|
|
|
ndb_delete_all.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.2 KB |
|
|
|
ndb_desc.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.2 KB |
|
|
|
ndb_drop_index.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.5 KB |
|
|
|
ndb_drop_table.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 1.9 KB |
|
|
|
ndb_error_reporter.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.7 KB |
|
|
|
ndb_mgm.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.4 KB |
|
|
|
ndb_mgmd.8 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.6 KB |
|
|
|
ndb_print_backup_file.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.6 KB |
|
|
|
ndb_print_schema_file.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.5 KB |
|
|
|
ndb_print_sys_file.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.8 KB |
|
|
|
ndb_restore.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 22.8 KB |
|
|
|
ndb_select_all.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 5.6 KB |
|
|
|
ndb_select_count.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.4 KB |
|
|
|
ndb_show_tables.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3 KB |
|
|
|
ndb_size.pl.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 9.6 KB |
|
|
|
ndb_waiter.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 4.9 KB |
|
|
|
ndbd.8 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 7.1 KB |
|
|
|
ndbd_redo_log_reader.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.7 KB |
|
|
|
ndbmtd.8 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 8.2 KB |
|
|
|
perror.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3 KB |
|
|
|
replace.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 3.3 KB |
|
|
|
resolve_stack_dump.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.6 KB |
|
|
|
resolveip.1 |
1.1.2 | 14 years ago | Bazaar Package Importer | Import upstream version 5.1.34 | 2.1 KB |
|
|