Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Upstream patch applied for memcached plugin support #44887

Closed
wants to merge 7 commits into from
Closed

Upstream patch applied for memcached plugin support #44887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d425f0
Upstream patch applied for memcached plugin support
Oct 13, 2015
60c26af
Moving patch :DATA before def install
Oct 13, 2015
13dc581
Merge branch 'master' of https://github.com/Homebrew/homebrew
Oct 13, 2015
24ec24f
Removing trailing whitespace.
Oct 13, 2015
53b8163
Revert "dbxml: add 6.0.17 bottle."
Oct 13, 2015
01fc0b7
Revert "dbxml 6.0.17 (new formula)"
Oct 13, 2015
c61ea5c
Revert "test-bot: update diff_start_sha1 unconditionally"
Oct 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 0 additions & 57 deletions Library/Formula/dbxml.rb
View file
Open in desktop

This file was deleted.

27 changes: 27 additions & 0 deletions Library/Formula/mysql.rb
View file
Open in desktop
Expand Up @@ -128,6 +128,9 @@ def install
libexec.install bin/"mysqlaccess.conf"
end

# memcached support (https://bugs.mysql.com/bug.php?id=7340)
patch :DATA

def post_install
# Make sure the datadir exists
datadir.mkpath
Expand Down Expand Up @@ -179,4 +182,28 @@ def plist; <<-EOS.undent
system "./mysql-test-run.pl", "status", "--vardir=#{testpath}"
end
end

end
__END__
--- a/configure.cmake 2014-05-06 05:45:57.000000000 -0500
+++ b/configure.cmake 2014-07-26 13:48:44.000000000 -0500
@@ -542,7 +542,7 @@
CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
CHECK_FUNCTION_EXISTS (chown HAVE_CHOWN)
CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
-CHECK_FUNCTION_EXISTS (ntohll HAVE_HTONLL)
+CHECK_SYMBOL_EXISTS (ntohll arpa/inet.h HAVE_HTONLL)

CHECK_FUNCTION_EXISTS (clock_gettime DNS_USE_CPU_CLOCK_FOR_ID)
CHECK_FUNCTION_EXISTS (epoll_create HAVE_EPOLL)
--- a/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h 2014-05-06 05:45:59.000000000 -0500
+++ b/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h 2014-07-26 14:20:44.000000000 -0500
@@ -11,6 +11,7 @@
*/
#include <memcached/visibility.h>
#include <memcached/types.h>
+#include "config.h"

#ifdef __cplusplus
extern "C" {

3 changes: 1 addition & 2 deletions Library/Homebrew/cmd/test-bot.rb
View file
Open in desktop
Expand Up @@ -318,13 +318,12 @@ def brew_update
# Use Travis CI Git variables for master or branch jobs.
elsif ENV["TRAVIS_COMMIT_RANGE"]
diff_start_sha1, diff_end_sha1 = ENV["TRAVIS_COMMIT_RANGE"].split "..."
diff_start_sha1 = git("merge-base", diff_start_sha1, diff_end_sha1).strip
# Otherwise just use the current SHA-1 (which may be overriden later)
else
diff_end_sha1 = diff_start_sha1 = current_sha1
end

diff_start_sha1 = git("merge-base", diff_start_sha1, diff_end_sha1).strip

# Handle no arguments being passed on the command-line e.g. `brew test-bot`.
if no_args?
if diff_start_sha1 == diff_end_sha1 || \
Expand Down