[Pkg-mysql-commits] r2040 - in mysql-5.5/branches/experimental/debian: . patches
Clint Byrum
spamaps-guest at alioth.debian.org
Tue Nov 29 06:01:39 UTC 2011
Author: spamaps-guest
Date: 2011-11-29 06:01:38 +0000 (Tue, 29 Nov 2011)
New Revision: 2040
Added:
mysql-5.5/branches/experimental/debian/patches/70_mysql_va_list.patch
mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch
mysql-5.5/branches/experimental/debian/patches/72_fix_standalone_tests.patch
Modified:
mysql-5.5/branches/experimental/debian/changelog
mysql-5.5/branches/experimental/debian/control
mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
mysql-5.5/branches/experimental/debian/libmysqlclient18.files
mysql-5.5/branches/experimental/debian/patches/series
mysql-5.5/branches/experimental/debian/rules
Log:
* 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
directory.
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
change.
* 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)
Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/changelog 2011-11-29 06:01:38 UTC (rev 2040)
@@ -8,6 +8,31 @@
* d/copyright: rearranging to have standalone license paragraphs
silencing lintian complaints about missing paragraphs.
* d/mysql-client-5.5.files: add mysql_plugin
+ * 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
+ directory.
+ 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
+ change.
+ * 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)
-- Clint Byrum <clint at ubuntu.com> Tue, 22 Nov 2011 22:41:18 -0800
Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/control 2011-11-29 06:01:38 UTC (rev 2040)
@@ -1,5 +1,5 @@
Source: mysql-5.5
-Section: misc
+Section: database
Priority: optional
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <norbert at tretkowski.de>, Clint Byrum <clint at ubuntu.com>
@@ -68,6 +68,7 @@
Conflicts: mysql-common-4.1
Provides: mysql-common-4.1
Replaces: mysql-common-4.1
+Breaks: mysql-server-5.1, mysql-client-5.1, mysql-server-core-5.1
Multi-Arch: foreign
Description: MySQL database common files, e.g. /etc/mysql/my.cnf
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -82,8 +83,8 @@
Architecture: any
Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-server-5.1 (<= 5.1.49-1), mysql-client-5.1
+Breaks: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
+Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
Suggests: libterm-readkey-perl
Description: MySQL database client binaries
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -116,7 +117,7 @@
Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
Breaks: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.1
-Provides: mysql-server, virtual-mysql-server
+Provides: virtual-mysql-server
Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0, mysql-server-4.1
Description: MySQL database server binaries and system database setup
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -128,7 +129,6 @@
databases.
Package: mysql-server
-Section: database
Architecture: all
Depends: mysql-server-5.5, ${misc:Depends}
Description: MySQL database server (metapackage depending on the latest version)
@@ -144,7 +144,6 @@
ease of use.
Package: mysql-client
-Section: database
Architecture: all
Depends: mysql-client-5.5, ${misc:Depends}
Description: MySQL database client (metapackage depending on the latest version)
Modified: mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files 2011-11-29 06:01:38 UTC (rev 2040)
@@ -1,7 +1,9 @@
usr/bin/mysql_config
-usr/include/mysql/*.h
+usr/include/mysql/*
usr/lib/*/libmysqlclient.a
usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlclient_r.a
+usr/lib/*/libmysqlclient_r.so
usr/lib/*/mysql/plugin/ha_example.*
usr/lib/*/mysql/plugin/ha_*_plugin.a
usr/lib/*/mysql/plugin/ha_*_plugin.la
Modified: mysql-5.5/branches/experimental/debian/libmysqlclient18.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.files 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.files 2011-11-29 06:01:38 UTC (rev 2040)
@@ -1 +1,2 @@
usr/lib/*/libmysqlclient.so.*
+usr/lib/*/libmysqlclient_r.so.*
Added: mysql-5.5/branches/experimental/debian/patches/70_mysql_va_list.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/70_mysql_va_list.patch (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/70_mysql_va_list.patch 2011-11-29 06:01:38 UTC (rev 2040)
@@ -0,0 +1,53 @@
+Bug: http://bugs.mysql.com/bug.php?id=62769
+Bug-Ubuntu: http://pad.lv/700982
+Description: make sure va_list usage is portable to fix FTBFS on ARM
+
+diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c
+--- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400
++++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400
+@@ -228,11 +228,13 @@
+ {
+ MYSQL mysql;
+ struct st_mysql_client_plugin **builtin;
++ va_list unused;
+
+ if (initialized)
+ return 0;
+
+ bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+
+ pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+ init_alloc_root(&mem_root, 128, 128);
+@@ -244,7 +246,7 @@
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ for (builtin= mysql_client_builtins; *builtin; builtin++)
+- add_plugin(&mysql, *builtin, 0, 0, 0);
++ add_plugin(&mysql, *builtin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+
+@@ -288,9 +290,13 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+ struct st_mysql_client_plugin *plugin)
+ {
++ va_list unused;
++
+ if (is_not_initialized(mysql, plugin->name))
+ return NULL;
+
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ /* make sure the plugin wasn't loaded meanwhile */
+@@ -302,7 +308,7 @@
+ plugin= NULL;
+ }
+ else
+- plugin= add_plugin(mysql, plugin, 0, 0, 0);
++ plugin= add_plugin(mysql, plugin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+ return plugin;
Added: mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch 2011-11-29 06:01:38 UTC (rev 2040)
@@ -0,0 +1,14 @@
+From: Clint Byrum <clint at ubuntu.com>
+Bug-Ubuntu: http://pad.lv/894146
+Forwarded: no, not needed
+Description: disables test to allow build to pass while this is investigated.
+
+Index: mysql-5.5/mysql-test/suite/rpl/t/disabled.def
+===================================================================
+--- mysql-5.5.orig/mysql-test/suite/rpl/t/disabled.def 2011-11-14 15:35:04.238715000 -0800
++++ mysql-5.5/mysql-test/suite/rpl/t/disabled.def 2011-11-23 12:36:46.406356349 -0800
+@@ -15,3 +15,4 @@
+ rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
+ rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+ rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
++rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
Added: mysql-5.5/branches/experimental/debian/patches/72_fix_standalone_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/72_fix_standalone_tests.patch (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/72_fix_standalone_tests.patch 2011-11-29 06:01:38 UTC (rev 2040)
@@ -0,0 +1,19 @@
+From: Clint Byrum <clint at ubuntu.com>
+Description: makes mtr look in the standard location from the
+ mysql-testsuite-5.5 package.
+Forwarded: not-needed
+
+Index: mysql-5.5/mysql-test/lib/mtr_cases.pm
+===================================================================
+--- mysql-5.5.orig/mysql-test/lib/mtr_cases.pm 2011-11-14 15:35:04.238715000 -0800
++++ mysql-5.5/mysql-test/lib/mtr_cases.pm 2011-11-25 14:41:00.433887578 -0800
+@@ -286,7 +286,8 @@
+ else
+ {
+ $suitedir= my_find_dir($::basedir,
+- ["share/mysql-test/suite",
++ ["lib/mysql-testsuite/suite",
++ "share/mysql-test/suite",
+ "mysql-test/suite",
+ "mysql-test",
+ # Look in storage engine specific suite dirs
Modified: mysql-5.5/branches/experimental/debian/patches/series
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/series 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/patches/series 2011-11-29 06:01:38 UTC (rev 2040)
@@ -1,2 +1,5 @@
38_scripts__mysqld_safe.sh__signals.patch
62_disable_tests.patch
+70_mysql_va_list.patch
+71_disable_rpl_tests.patch
+72_fix_standalone_tests.patch
Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules 2011-11-23 06:44:38 UTC (rev 2039)
+++ mysql-5.5/branches/experimental/debian/rules 2011-11-29 06:01:38 UTC (rev 2040)
@@ -214,6 +214,13 @@
# echo "ERROR: versioned symbols are absent"; \
# exit 1; \
#fi
+ # libmysqlclient_r is now a symlink to libmysqlclient. But it is
+ # created wrong by the cmake build system and points at
+ # libmysqlclient.so instead of the corresponding versioned lib.
+ for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so*` ; do \
+ rlib=`basename $$i | sed -e 's/libmysqlclient\./libmysqlclient_r./'` ;\
+ ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\
+ done
# libmysqlclient-dev: forgotten header file since 3.23.25?
#cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
More information about the Pkg-mysql-commits
mailing list