diff --git a/Formula/percona-server.rb b/Formula/percona-server.rb index 2b0e2a4ad18..be61a6f6776 100644 --- a/Formula/percona-server.rb +++ b/Formula/percona-server.rb @@ -1,9 +1,8 @@ class PerconaServer < Formula desc "Drop-in MySQL replacement" homepage "https://www.percona.com" - url "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-5.6.28-76.1/source/tarball/percona-server-5.6.28-76.1.tar.gz" - version "5.6.28-76.1" - sha256 "ab8ab794a58a82132645ae84b74de91c7f9a5bcf81f2162628ce8976a00a4fd4" + url "https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.11-4/source/tarball/percona-server-5.7.11-4.tar.gz" + sha256 "3634d2262e646db11b03837561acb0e084f33e5a597957506cf4c333ea811921" bottle do revision 1 @@ -12,17 +11,6 @@ class PerconaServer < Formula sha256 "aa6efe7ebbcdfa1a26530300da885f56a33d3132f953886cdbe309fb545da6ec" => :mavericks end - devel do - url "https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.10-2rc2/source/tarball/percona-server-5.7.10-2rc2.tar.gz" - version "5.7.10-2rc2" - sha256 "5f920eb8a80c4125f43ac084f51ddc7b004efb2b02a9d2d0ba76fb3c11889019" - - resource "boost" do - url "https://downloads.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2" - sha256 "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca" - end - end - option :universal option "with-test", "Build with unit tests" option "with-embedded", "Build the embedded server" @@ -51,6 +39,11 @@ class PerconaServer < Formula cause "https://github.com/Homebrew/homebrew/issues/issue/144" end + resource "boost" do + url "https://downloads.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2" + sha256 "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca" + end + # Where the database files should be located. Existing installs have them # under var/percona, but going forward they will be under var/mysql to be # shared with the mysql and mariadb formulae. @@ -104,13 +97,11 @@ class PerconaServer < Formula # https://bugs.launchpad.net/percona-server/+bug/1531446 args.concat %W[-DWITHOUT_TOKUDB=1] - if build.devel? - # MySQL >5.7.x mandates Boost as a requirement to build & has a strict - # version check in place to ensure it only builds against expected release. - # This is problematic when Boost releases don't align with MySQL releases. - (buildpath/"boost_1_59_0").install resource("boost") - args << "-DWITH_BOOST=#{buildpath}/boost_1_59_0" - end + # MySQL >5.7.x mandates Boost as a requirement to build & has a strict + # version check in place to ensure it only builds against expected release. + # This is problematic when Boost releases don't align with MySQL releases. + (buildpath/"boost_1_59_0").install resource("boost") + args << "-DWITH_BOOST=#{buildpath}/boost_1_59_0" # To enable unit testing at build, we need to download the unit testing suite if build.with? "test" @@ -142,9 +133,6 @@ class PerconaServer < Formula # See: https://github.com/Homebrew/homebrew/issues/4975 rm_rf prefix+"data" - # Link the setup script into bin - bin.install_symlink prefix/"scripts/mysql_install_db" - # Fix up the control script and link into bin inreplace "#{prefix}/support-files/mysql.server" do |s| s.gsub!(/^(PATH=".*)(")/, "\\1:#{HOMEBREW_PREFIX}/bin\\2") @@ -153,25 +141,6 @@ class PerconaServer < Formula end bin.install_symlink prefix/"support-files/mysql.server" - - # mysqlaccess deprecated on 5.6.17, and removed in 5.7.4. - # See: https://bugs.mysql.com/bug.php?id=69012 - if build.stable? - # Move mysqlaccess to libexec - libexec.mkpath - mv "#{bin}/mysqlaccess", libexec - mv "#{bin}/mysqlaccess.conf", libexec - end - end - - def post_install - # Make sure that data directory exists - datadir.mkpath - unless File.exist? "#{datadir}/mysql/user.frm" - ENV["TMPDIR"] = nil - system "#{bin}/mysql_install_db", "--verbose", "--user=#{ENV["USER"]}", - "--basedir=#{prefix}", "--datadir=#{datadir}", "--tmpdir=/tmp" - end end def caveats; <<-EOS.undent @@ -180,6 +149,9 @@ class PerconaServer < Formula To connect: mysql -uroot + + To initialize the data directory: + mysqld --initialize --datadir=#{datadir} --user=#{ENV["USER"]} EOS end