diff -Nru pinba-engine-mysql-1.1.0/debian/changelog pinba-engine-mysql-1.1.0/debian/changelog --- pinba-engine-mysql-1.1.0/debian/changelog 2016-04-05 12:51:00.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/changelog 2016-04-20 10:20:20.000000000 +0000 @@ -1,3 +1,18 @@ +pinba-engine-mysql (1.1.0-1ubuntu1) xenial; urgency=medium + + [ Lars Tangvald ] + * Added mysql-5.7.patch (LP: #1572427) + Contains the necessary changes to build with mysql-source-5.7 + * Added fix-ftbfs-arm-i386.patch + Fix build failure on armhf on i386 + * d/control: switch from MySQL 5.6 to 5.7. + + [ Robie Basak ] + * d/control: add Breaks/Replaces against old package + pinba-engine-mysql-5.6. + + -- Lars Tangvald Wed, 20 Apr 2016 09:31:27 +0200 + pinba-engine-mysql (1.1.0-1build3) xenial; urgency=medium * Rebuild against libmysqlclient20. diff -Nru pinba-engine-mysql-1.1.0/debian/control pinba-engine-mysql-1.1.0/debian/control --- pinba-engine-mysql-1.1.0/debian/control 2015-07-23 11:34:49.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/control 2016-04-20 10:01:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: pinba-engine-mysql Section: database Priority: extra -Maintainer: Vincent Bernat +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Vincent Bernat Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), dh-autoreconf, @@ -9,7 +10,7 @@ libevent-dev, libjemalloc-dev, libmysqlclient-dev, - mysql-source-5.6, + mysql-source-5.7, chrpath Standards-Version: 3.9.6 Homepage: http://pinba.org/ @@ -18,7 +19,7 @@ Package: pinba-engine-mysql Architecture: all -Depends: pinba-engine-mysql-5.6, ${misc:Depends} +Depends: pinba-engine-mysql-5.7, ${misc:Depends} Description: realtime statistics server for PHP using MySQL (metapackage) Pinba is a MySQL storage engine that acts as a realtime monitoring/statistics server for PHP using MySQL as a read-only @@ -35,10 +36,12 @@ . This metapackage depends on the latest version available. -Package: pinba-engine-mysql-5.6 +Package: pinba-engine-mysql-5.7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${mysql:Depends}, dbconfig-common -Recommends: mysql-client-5.6 +Recommends: mysql-client-5.7 +Breaks: pinba-engine-mysql-5.6 (<< 1.1.0-1ubuntu1~) +Replaces: pinba-engine-mysql-5.6 (<< 1.1.0-1ubuntu1~) Description: realtime statistics server for PHP using MySQL as a read-only interface Pinba is a MySQL storage engine that acts as a realtime monitoring/statistics server for PHP using MySQL as a read-only diff -Nru pinba-engine-mysql-1.1.0/debian/patches/fix-ftbfs-arm-i386.patch pinba-engine-mysql-1.1.0/debian/patches/fix-ftbfs-arm-i386.patch --- pinba-engine-mysql-1.1.0/debian/patches/fix-ftbfs-arm-i386.patch 1970-01-01 00:00:00.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/patches/fix-ftbfs-arm-i386.patch 2016-04-20 08:08:42.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix build failure on armhf and i386 + The function JudyLNext takes a Word_t* but pinba passes uint64_t + Change type to Word_t +Author: Lars Tangvald +Bug: https://github.com/tony2001/pinba_engine/issues/40 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=793511 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pinba-engine-mysql/+bug/1484583 +Forwarded: no +Last-Update: 2016-04-20 + +--- pinba-engine-mysql-1.1.0.orig/src/ha_pinba.cc ++++ pinba-engine-mysql-1.1.0/src/ha_pinba.cc +@@ -2678,7 +2678,7 @@ int ha_pinba::read_next_row(unsigned cha + PPvoid_t ppvalue; + char name[PINBA_MAX_LINE_LEN] = {0}; + pinba_tag *tag; +- uint64_t str_hash; ++ Word_t str_hash; + + str_hash = this_index[active_index].ival; + diff -Nru pinba-engine-mysql-1.1.0/debian/patches/mysql-5.7.patch pinba-engine-mysql-1.1.0/debian/patches/mysql-5.7.patch --- pinba-engine-mysql-1.1.0/debian/patches/mysql-5.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/patches/mysql-5.7.patch 2016-04-20 08:08:42.000000000 +0000 @@ -0,0 +1,61 @@ +Description: Make pinba-engine-mysql build with MySQL 5.7 + The structure of the source code in 5.7 has changed from 5.6, requiring changes: + * Some header files have been moved to different locations + Include libbinlogevents/export and libbinlogevents/include + * mysqld_error.h is missing from the source. This seems like a 5.7 packaging bug. + The file is in libmysqlclient-dev, so we include /usr/include/mysql + * structs.h and my_pthread.h are gone, their contents moved to other files + * One extra parameter for my_hash_init that can be set to 0 + * One extra parameter for my_multi_malloc, set to PSI_NOT_INSTRUMENTED +Author: Lars Tangvald +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pinba-engine-mysql/+bug/1572427 +Forwarded: no +Last-Update: 2016-04-20 + +--- pinba-engine-mysql-1.1.0.orig/configure.ac ++++ pinba-engine-mysql-1.1.0/configure.ac +@@ -153,7 +153,7 @@ main() { + CFLAGS="$CFLAGS_old" + + AC_DEFINE([MYSQL_SRC], [1], [Source directory for MySQL]) +- MYSQL_INC="-I$with_mysql/sql -I$with_mysql/include -I$with_mysql/regex -I$with_mysql" ++ MYSQL_INC="-I$with_mysql/sql -I$with_mysql/include -I$with_mysql/regex -I$with_mysql -I/usr/include/mysql -I$with_mysql/libbinlogevents/export -I$with_mysql/libbinlogevents/include" + fi + + +--- pinba-engine-mysql-1.1.0.orig/src/ha_pinba.cc ++++ pinba-engine-mysql-1.1.0/src/ha_pinba.cc +@@ -34,7 +34,6 @@ + #ifdef PINBA_ENGINE_MYSQL_VERSION_5_5 + # include + # include +-# include + # include + #else + # include +@@ -42,7 +41,6 @@ + #include + #include + #include +-#include + + #include "ha_pinba.h" + +@@ -519,7 +517,7 @@ static int pinba_engine_init(void *p) /* + } + + (void)pthread_mutex_init(&pinba_mutex, MY_MUTEX_INIT_FAST); +- (void)hash_init(&pinba_open_tables, system_charset_info, 32, 0, 0, (hash_get_key)pinba_get_key, 0, 0); ++ (void)hash_init(&pinba_open_tables, system_charset_info, 32, 0, 0, (hash_get_key)pinba_get_key, 0, 0, 0); + + pinba_hton->state = SHOW_OPTION_YES; + pinba_hton->create = pinba_create_handler; +@@ -1680,7 +1678,7 @@ static PINBA_SHARE *get_share(const char + return NULL; + } + +- if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL), &share, sizeof(*share), &tmp_name, length+1, NullS)) { ++ if (!my_multi_malloc(PSI_NOT_INSTRUMENTED, MYF(MY_WME | MY_ZEROFILL), &share, sizeof(*share), &tmp_name, length+1, NullS)) { + pthread_mutex_unlock(&pinba_mutex); + return NULL; + } diff -Nru pinba-engine-mysql-1.1.0/debian/patches/series pinba-engine-mysql-1.1.0/debian/patches/series --- pinba-engine-mysql-1.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/patches/series 2016-04-20 08:08:42.000000000 +0000 @@ -0,0 +1,2 @@ +mysql-5.7.patch +fix-ftbfs-arm-i386.patch diff -Nru pinba-engine-mysql-1.1.0/debian/rules pinba-engine-mysql-1.1.0/debian/rules --- pinba-engine-mysql-1.1.0/debian/rules 2015-07-23 11:34:49.000000000 +0000 +++ pinba-engine-mysql-1.1.0/debian/rules 2016-04-20 08:08:42.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Don't forget to modify debian/control as well -MYSQL=5.6 +MYSQL=5.7 # Hardening DPKG_EXPORT_BUILDFLAGS = 1