Bug 215711 - [maintainer] update databases/mysql57-server and databases/mysql57-client from 5.7.15 to 5.7.17
Summary: [maintainer] update databases/mysql57-server and databases/mysql57-client fro...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Nikolai Lifanov
URL: https://dev.mysql.com/doc/relnotes/my...
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2017-01-02 14:45 UTC by Mahdi Mokhtari
Modified: 2017-01-03 17:05 UTC (History)
1 user (show)

See Also:


Attachments
Patch updates mysql57 to 5.7.17 (11.46 KB, patch)
2017-01-02 14:45 UTC, Mahdi Mokhtari
mmokhi: maintainer-approval+
Details | Diff
Patch updates mysql57 to 5.7.17 (14.45 KB, patch)
2017-01-02 15:22 UTC, Mahdi Mokhtari
mmokhi: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-02 14:45:43 UTC
Created attachment 178449 [details]
Patch updates mysql57 to 5.7.17

This patch updates mysql57 ports from 5.7.15 to 5.7.17
tested with poudriere was okay.
portlint -AC result is fine.
Comment 1 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-02 14:46:22 UTC
All seems ready and working.
Returning to pool so that a committer can take it :)
Comment 2 Nikolai Lifanov freebsd_committer 2017-01-02 15:13:16 UTC
There was a merge conflict on a revision bump. I applied this change by hand.
Comment 3 Nikolai Lifanov freebsd_committer 2017-01-02 15:14:45 UTC
Also, I only see the server update piece in the submitted patch.
Can you give me the patch to update the client also please?
Comment 4 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-02 15:16:46 UTC
(In reply to Nikolai Lifanov from comment #3)
No changes were needed to the slave port (client) for the update, but by updating the master port (server) actually client is being updated.

Lemme check my local tree for the conflict.
I had no problems.
Comment 5 Nikolai Lifanov freebsd_committer 2017-01-02 15:17:50 UTC
Ohh yeah, I understand!

But I also get a patch conflict during poudriere testport:

=======================<phase: patch          >============================
===>  Patching for mysql57-server-5.7.17
===>  Applying FreeBSD patches for mysql57-server-5.7.17
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to sql/json_dom.h.rej
=> Patch patch-sql_json__dom.h failed to apply cleanly.
=> Patch(es) patch-CMakeLists.txt patch-client_CMakeLists.txt patch-cmake_plugin.cmake patch-cmake_ssl.cmake patch-cmd-line-utils_libedit_chartype.h patch-cmd-line-utils_libedit_vi.c patch-include_CMakeLists.txt patch-include_my__compare.h patch-include_my__thread__os__id.h patch-include_myisam.h patch-libmysql_CMakeLists.txt patch-libservices_CMakeLists.txt patch-man_CMakeLists.txt patch-mysys__ssl_my__default.cc patch-plugin_password__validation_validate__password.cc patch-rapid_plugin_x_CMakeLists.txt patch-rapid_plugin_x_mysqlx__configure.cmake patch-rapid_unittest_gunit_xplugin_CMakeLists.txt patch-scripts_CMakeLists.txt patch-sql_CMakeLists.txt patch-sql_conn__handler_socket__connection.cc applied cleanly.
*** Error code 1
Comment 6 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-02 15:22:26 UTC
Created attachment 178451 [details]
Patch updates mysql57 to 5.7.17

I guess I forgot to `svn delete` on no-more-required patches after physically deleting them on my local tree.
This patch also includes deleting them too.
Comment 7 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-02 15:36:00 UTC
(In reply to Mahdi Mokhtari from comment #6)
Tested on poudriere on 10.3 jail and it's fine for both client/server.
Also portlint says fine.
Comment 8 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-03 14:03:45 UTC
Any updates ? :-)
Comment 9 commit-hook freebsd_committer 2017-01-03 14:41:29 UTC
A commit references this bug:

Author: lifanov
Date: Tue Jan  3 14:40:32 UTC 2017
New revision: 430476
URL: https://svnweb.freebsd.org/changeset/ports/430476

Log:
  update mysql57 ports to 5.7.17

   Changelog: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-17.html

  PR:		215711
  Submitted by:	Mahdi Mokhtari <mokhi64@gmail.com> (maintainer)
  Reviewed by:	matthew
  Approved by:	matthew (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9027

Changes:
  head/databases/mysql57-server/Makefile
  head/databases/mysql57-server/distinfo
  head/databases/mysql57-server/files/patch-sql_json__dom.h
  head/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
  head/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
  head/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
  head/databases/mysql57-server/pkg-plist
Comment 10 Nikolai Lifanov freebsd_committer 2017-01-03 14:41:55 UTC
Committed, thanks!
Comment 11 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-01-03 15:22:00 UTC
(In reply to Nikolai Lifanov from comment #10)
Thanks a lot :)
Comment 12 Nikolai Lifanov freebsd_committer 2017-01-03 17:05:38 UTC
No problem! Feel free to CC me on your other submissions and I'll grab them if I have time.