/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.153 Revision 1.176
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.153 2010/10/27 07:19:24 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.176 2012/11/01 20:22:57 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
9# - Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org> 9# Robin H. Johnson <robbat2@gentoo.org>
10# @AUTHOR:
11# Francesco Riosa (Retired) <vivo@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds 12# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION: 13# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds 14# The mysql.eclass provides almost all the code to build the mysql ebuilds
14# including the src_unpack, src_prepare, src_configure, src_compile, 15# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm 16# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks. 17# phase hooks.
17 18
18WANT_AUTOCONF="latest" 19WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 20WANT_AUTOMAKE="latest"
20 21
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs 22inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
22 23
23# Shorten the path because the socket path length must be shorter than 107 chars 24# Shorten the path because the socket path length must be shorter than 107 chars
24# and we will run a mysql server during test phase 25# and we will run a mysql server during test phase
25S="${WORKDIR}/mysql" 26S="${WORKDIR}/mysql"
26 27
27[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" 28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
28if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
29 EGIT_PROJECT=mysql-extras 30 EGIT_PROJECT=mysql-extras
30 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
31 inherit git 32 inherit git-2
32fi 33fi
33 34
34case "${EAPI:-0}" in 35case "${EAPI:-0}" in
35 2) 36 2|3|4|5)
36 EXPORT_FUNCTIONS pkg_setup \ 37 EXPORT_FUNCTIONS pkg_setup \
37 src_unpack src_prepare \ 38 src_unpack src_prepare \
38 src_configure src_compile \ 39 src_configure src_compile \
39 src_install \ 40 src_install \
40 pkg_preinst pkg_postinst \ 41 pkg_preinst pkg_postinst \
124PERCONA_VER="${PERCONA_VER}" 125PERCONA_VER="${PERCONA_VER}"
125 126
126# Be warned, *DEPEND are version-dependant 127# Be warned, *DEPEND are version-dependant
127# These are used for both runtime and compiletime 128# These are used for both runtime and compiletime
128DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 129DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
129 userland_GNU? ( sys-process/procps ) 130 kernel_linux? ( sys-process/procps )
130 >=sys-apps/sed-4 131 >=sys-apps/sed-4
131 >=sys-apps/texinfo-4.7-r1 132 >=sys-apps/texinfo-4.7-r1
132 >=sys-libs/readline-4.1 133 >=sys-libs/readline-4.1
133 >=sys-libs/zlib-1.2.3" 134 >=sys-libs/zlib-1.2.3"
134 135
139for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do 140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
140 [[ "${i}" == ${PN} ]] || 141 [[ "${i}" == ${PN} ]] ||
141 DEPEND="${DEPEND} !dev-db/${i}" 142 DEPEND="${DEPEND} !dev-db/${i}"
142done 143done
143 144
145# prefix: first need to implement something for #196294
144RDEPEND="${DEPEND} 146RDEPEND="${DEPEND}
145 !minimal? ( dev-db/mysql-init-scripts ) 147 !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
146 selinux? ( sec-policy/selinux-mysql )" 148 selinux? ( sec-policy/selinux-mysql )"
149
150DEPEND="${DEPEND}
151 virtual/yacc"
152
153if [ "${EAPI:-0}" = "2" ]; then
154 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
155fi
147 156
148# compile-time-only 157# compile-time-only
149mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
150|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
151 160
152# compile-time-only 161# compile-time-only
153mysql_version_is_at_least "5.1.12" \ 162mysql_version_is_at_least "5.1.12" \
154&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 163&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
164
165[[ "${PN}" == "mariadb" ]] \
166&& mysql_version_is_at_least "5.2" \
167&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
168#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
169# sphinx? ( app-misc/sphinx )"
155 170
156# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 171# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
157PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 172PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
158 173
159# For other stuff to bring us in 174# For other stuff to bring us in
238[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 253[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
239&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 254&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
240 255
241[[ "${PN}" == "mariadb" ]] \ 256[[ "${PN}" == "mariadb" ]] \
242&& IUSE="${IUSE} libevent" 257&& IUSE="${IUSE} libevent"
258
259[[ "${PN}" == "mariadb" ]] \
260&& mysql_version_is_at_least "5.2" \
261&& IUSE="${IUSE} oqgraph"
262#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
263#&& IUSE="${IUSE} oqgraph sphinx"
243 264
244# MariaDB has integrated PBXT 265# MariaDB has integrated PBXT
245# PBXT_VERSION means that we have a PBXT patch for this PV 266# PBXT_VERSION means that we have a PBXT patch for this PV
246# PBXT was only introduced after 5.1.12 267# PBXT was only introduced after 5.1.12
247pbxt_patch_available() { 268pbxt_patch_available() {
341# @DESCRIPTION: 362# @DESCRIPTION:
342# void mysql_init_vars() 363# void mysql_init_vars()
343# Initialize global variables 364# Initialize global variables
344# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
345mysql_init_vars() { 366mysql_init_vars() {
346 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
347 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
348 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
349 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
350 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
351 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
352 373
353 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
354 MY_DATADIR="" 375 MY_DATADIR=""
355 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
356 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
357 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
358 | tail -n1` 379 | tail -n1`
359 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
360 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
361 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
362 | tail -n1` 383 | tail -n1`
363 fi 384 fi
364 fi 385 fi
365 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
437 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
438 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
439 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
440 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
441 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
442 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
443 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
444 465
445 if use static ; then 466 if use static ; then
446 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
447 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
482 fi 503 fi
483 504
484} 505}
485 506
486configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
487 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
488 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
489 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
490 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
491 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
492 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
493 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 515 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
494 516
495 # --with-vio is not needed anymore, it's on by default and 517 # --with-vio is not needed anymore, it's on by default and
496 # has been removed from configure 518 # has been removed from configure
497 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
563 585
564configure_51() { 586configure_51() {
565 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
566 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
567 # readline.h instead of history.h 589 # readline.h instead of history.h
568 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
569 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
570 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
571 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
572 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
573 myconf="${myconf} --without-pstack" 595 myconf="${myconf} --without-pstack"
574 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" 596 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
575 597
598 # This is an explict die here, because if we just forcibly disable it, then the
599 # user's data is not accessible.
600 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
576 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
577 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 602 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
578 myconf="${myconf} $(use_enable community community-features)" 603 myconf="${myconf} $(use_enable community community-features)"
579 if use community; then 604 if use community; then
580 myconf="${myconf} $(use_enable profiling)" 605 myconf="${myconf} $(use_enable profiling)"
581 else 606 else
594 \) \ 619 \) \
595 -print0 \ 620 -print0 \
596 | xargs -0 sed -r -n \ 621 | xargs -0 sed -r -n \
597 -e '/^MYSQL_STORAGE_ENGINE/{ 622 -e '/^MYSQL_STORAGE_ENGINE/{
598 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ; 623 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
599 s~^([^ ]+).*~\1~gp; 624 s~^([^ ]+).*~\1~gp;
600 }' \ 625 }' \
601 | tr -s '\n' ' ' 626 | tr -s '\n' ' '
602 )" 627 )"
603 628
604 # 5.1 introduces a new way to manage storage engines (plugins) 629 # 5.1 introduces a new way to manage storage engines (plugins)
617 fi 642 fi
618 # Now the extras 643 # Now the extras
619 if use extraengine ; then 644 if use extraengine ; then
620 # like configuration=max-no-ndb, archive and example removed in 5.1.11 645 # like configuration=max-no-ndb, archive and example removed in 5.1.11
621 # not added yet: ibmdb2i 646 # not added yet: ibmdb2i
622 # Not supporting as examples: example,daemon_example,ftexample 647 # Not supporting as examples: example,daemon_example,ftexample
623 plugins_sta="${plugins_sta} partition" 648 plugins_sta="${plugins_sta} partition"
624 plugins_dyn="${plugins_sta} federated"
625 649
626 if [[ "${PN}" != "mariadb" ]] ; then 650 if [[ "${PN}" != "mariadb" ]] ; then
627 elog "Before using the Federated storage engine, please be sure to read" 651 elog "Before using the Federated storage engine, please be sure to read"
628 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 652 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
653 plugins_dyn="${plugins_sta} federated"
629 else 654 else
630 elog "MariaDB includes the FederatedX engine. Be sure to read" 655 elog "MariaDB includes the FederatedX engine. Be sure to read"
631 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 656 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
657 plugins_dyn="${plugins_sta} federatedx"
632 fi 658 fi
633 else 659 else
634 plugins_dis="${plugins_dis} partition federated" 660 plugins_dis="${plugins_dis} partition federated"
635 fi 661 fi
636 662
654 fi 680 fi
655 681
656 if [[ "${PN}" == "mariadb" ]] ; then 682 if [[ "${PN}" == "mariadb" ]] ; then
657 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 683 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
658 # caught above. 684 # caught above.
685 # This is not optional, without it several upstream testcases fail.
686 # Also strongly recommended by upstream.
687 if [[ "${PV}" < "5.2.0" ]] ; then
688 myconf="${myconf} --with-maria-tmp-tables"
659 plugins_sta="${plugins_sta} maria" 689 plugins_sta="${plugins_sta} maria"
690 else
691 myconf="${myconf} --with-aria-tmp-tables"
692 plugins_sta="${plugins_sta} aria"
693 fi
660 694
661 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] || 695 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
662 die "The ${P} package doesn't provide innobase nor xtradb" 696 die "The ${P} package doesn't provide innobase nor xtradb"
663 697
664 for i in innobase xtradb ; do 698 for i in innobase xtradb ; do
665 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}" 699 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
666 done 700 done
667 701
668 myconf="${myconf} $(use_with libevent)" 702 myconf="${myconf} $(use_with libevent)"
669 # This is not optional, without it several upstream testcases fail. 703
670 # Also strongly recommended by upstream. 704 if mysql_version_is_at_least "5.2" ; then
671 myconf="${myconf} --with-maria-tmp-tables" 705 #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
706 #for i in oqgraph sphinx ; do
707 for i in oqgraph ; do
708 use ${i} \
709 && plugins_dyn="${plugins_dyn} ${i}" \
710 || plugins_dis="${plugins_dis} ${i}"
711 done
712 fi
672 fi 713 fi
673 714
674 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then 715 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
675 use pbxt \ 716 use pbxt \
676 && plugins_dyn="${plugins_dyn} pbxt" \ 717 && plugins_sta="${plugins_sta} pbxt" \
677 || plugins_dis="${plugins_dis} pbxt" 718 || plugins_dis="${plugins_dis} pbxt"
678 fi 719 fi
679 720
680 use static && \ 721 use static && \
681 plugins_sta="${plugins_sta} ${plugins_dyn}" && \ 722 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
701 742
702 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
703 eautoreconf 744 eautoreconf
704 745
705 local myconf="" 746 local myconf=""
706 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
707 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
708 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
709} 750}
710 751
711pbxt_src_compile() { 752pbxt_src_compile() {
736# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 777# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
737# check for conflicting use flags 778# check for conflicting use flags
738# create new user and group for mysql 779# create new user and group for mysql
739# warn about deprecated features 780# warn about deprecated features
740mysql_pkg_setup() { 781mysql_pkg_setup() {
741 if hasq test ${FEATURES} ; then 782 if has test ${FEATURES} ; then
742 if ! use minimal ; then 783 if ! use minimal ; then
743 if [[ $UID -eq 0 ]]; then 784 if [[ $UID -eq 0 ]]; then
744 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 785 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
745 fi 786 fi
746 fi 787 fi
747 fi 788 fi
789
790 # bug 350844
791 case "${EAPI:-0}" in
792 0 | 1)
793 if use static && ! built_with_use sys-libs/ncurses static-libs; then
794 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
795 fi
796 ;;
797 esac
748 798
749 # Check for USE flag problems in pkg_setup 799 # Check for USE flag problems in pkg_setup
750 if use static && use ssl ; then 800 if use static && use ssl ; then
751 M="MySQL does not support being built statically with SSL support enabled!" 801 M="MySQL does not support being built statically with SSL support enabled!"
752 eerror "${M}" 802 eerror "${M}"
753 die "${M}" 803 die "${M}"
804 fi
805
806 if mysql_version_is_at_least "5.1.51" \
807 && ! mysql_version_is_at_least "5.2" \
808 && use debug ; then
809 # Also in package.use.mask
810 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
754 fi 811 fi
755 812
756 if ! mysql_version_is_at_least "5.0" \ 813 if ! mysql_version_is_at_least "5.0" \
757 && use raid \ 814 && use raid \
758 && use static ; then 815 && use static ; then
781 # Bug #290570, 284946, 307251 838 # Bug #290570, 284946, 307251
782 # Upstream changes made us need a fairly new GCC4. 839 # Upstream changes made us need a fairly new GCC4.
783 # But only for 5.0.8[3-6]! 840 # But only for 5.0.8[3-6]!
784 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then 841 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
785 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
786 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
844 *-darwin*:4.*) : ;; # bug #310615
787 2*|3*|4.0|4.1|4.2) 845 *:2*|*:3*|*:4.0|*:4.1|*:4.2)
788 eerror "Some releases of MySQL required a very new GCC, and then" 846 eerror "Some releases of MySQL required a very new GCC, and then"
789 eerror "later release relaxed that requirement again. Either pick a" 847 eerror "later release relaxed that requirement again. Either pick a"
790 eerror "MySQL >=5.0.87, or use a newer GCC." 848 eerror "MySQL >=5.0.87, or use a newer GCC."
791 die "Active GCC too old!" ;; 849 die "Active GCC too old!" ;;
792 esac 850 esac
887 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 945 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
888 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}" 946 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
889 popd >/dev/null 947 popd >/dev/null
890 fi 948 fi
891 949
892 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then 950 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
893 einfo "Adding storage engine: PBXT" 951 einfo "Adding storage engine: PBXT"
894 pushd "${S}"/storage >/dev/null 952 pushd "${S}"/storage >/dev/null
895 i='pbxt' 953 i='pbxt'
896 [ -d "${i}" ] && rm -rf "${i}" 954 [ -d "${i}" ] && rm -rf "${i}"
897 cp -ral "${WORKDIR}/${PBXT_P}" "${i}" 955 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
920 978
921 if mysql_check_version_range "4.1 to 5.0.99.99" \ 979 if mysql_check_version_range "4.1 to 5.0.99.99" \
922 && use berkdb ; then 980 && use berkdb ; then
923 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
924 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 982 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
925 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 983 cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
926 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
927 #These files exist only with libtool-2*, and need to be included. 985 #These files exist only with libtool-2*, and need to be included.
928 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
929 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
930 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
931 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" 989 cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
932 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
933 fi 991 fi
934 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
935 sh s_all \ 993 sh s_all \
936 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
937 popd &>/dev/null 995 popd &>/dev/null
977 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 1035 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
978 export CXXFLAGS 1036 export CXXFLAGS
979 1037
980 # bug #283926, with GCC4.4, this is required to get correct behavior. 1038 # bug #283926, with GCC4.4, this is required to get correct behavior.
981 append-flags -fno-strict-aliasing 1039 append-flags -fno-strict-aliasing
982 1040
983 # bug #335185, with GCC4.5 on x86 only, omit-frame-pointer causes a 1041 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
984 # mis-compile 1042 # causes a mis-compile.
985 use x86 && [[ "$(gcc-version)" == "4.5" ]] && \ 1043 # Upstream bugs:
1044 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
1045 # http://bugs.mysql.com/bug.php?id=45205
1046 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
986 append-flags -fno-omit-frame-pointer && \ 1047 append-flags -fno-omit-frame-pointer && \
987 filter-flags -fomit-frame-pointer 1048 filter-flags -fomit-frame-pointer
988 1049
989 econf \ 1050 econf \
990 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
991 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
992 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
993 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
994 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
995 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
996 --with-low-memory \ 1057 --with-low-memory \
997 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
998 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
999 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
1000 --without-docs \ 1061 --without-docs \
1062 --with-LIBDIR="$(get_libdir)" \
1001 ${myconf} || die "econf failed" 1063 ${myconf} || die "econf failed"
1002 1064
1003 # TODO: Move this before autoreconf !!! 1065 # TODO: Move this before autoreconf !!!
1004 find . -type f -name Makefile -print0 \ 1066 find . -type f -name Makefile -print0 \
1005 | xargs -0 -n100 sed -i \ 1067 | xargs -0 -n100 sed -i \
1034 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
1035 mysql_init_vars 1097 mysql_init_vars
1036 1098
1037 emake install \ 1099 emake install \
1038 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
1039 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
1040 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
1041 || die "emake install failed" 1103 || die "emake install failed"
1042 1104
1043 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1044 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1050 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1051 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
1052 1114
1053 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
1054 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
1055 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
1056 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
1057 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
1058 do 1120 do
1059 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
1060 done 1122 done
1061 1123
1062 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
1063 if use minimal ; then 1125 if use minimal ; then
1064 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
1065 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
1066 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 1128 rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
1067 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
1068 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1130 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
1069 fi 1131 fi
1070 1132
1071 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
1072 # testsuite. It DOES have a use to be installed, esp. when you want to do a 1134 # testsuite. It DOES have a use to be installed, esp. when you want to do a
1080 3*|4.0) mysql_mycnf_version="4.0" ;; 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
1081 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;; 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
1082 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;; 1144 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1083 esac 1145 esac
1084 einfo "Building default my.cnf (${mysql_mycnf_version})" 1146 einfo "Building default my.cnf (${mysql_mycnf_version})"
1085 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
1086 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1087 mycnf_src="my.cnf-${mysql_mycnf_version}" 1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
1088 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
1151 -e "s!/tmp!${EPREFIX}/tmp!" \
1152 -e "s!/usr!${EPREFIX}/usr!" \
1153 -e "s!= /var!= ${EPREFIX}/var!" \
1089 "${FILESDIR}/${mycnf_src}" \ 1154 "${FILESDIR}/${mycnf_src}" \
1090 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
1091 if use latin1 ; then 1157 if use latin1 ; then
1092 sed -i \ 1158 sed -i \
1093 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
1094 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
1095 fi 1161 fi
1099 if ! use minimal ; then 1165 if ! use minimal ; then
1100 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
1101 # Empty directories ... 1167 # Empty directories ...
1102 diropts "-m0750" 1168 diropts "-m0750"
1103 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
1104 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
1105 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
1106 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
1107 fi 1173 fi
1108 1174
1109 diropts "-m0755" 1175 diropts "-m0755"
1110 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
1111 dodir "${folder}" 1177 dodir "${folder}"
1112 keepdir "${folder}" 1178 keepdir "${folder}"
1113 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
1114 done 1180 done
1115 fi 1181 fi
1116 1182
1117 # Docs 1183 # Docs
1118 einfo "Installing docs" 1184 einfo "Installing docs"
1119 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1185 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
1186 [[ -f "$i" ]] && dodoc "$i"
1187 done
1120 doinfo "${S}"/Docs/mysql.info 1188 doinfo "${S}"/Docs/mysql.info
1121 1189
1122 # Minimal builds don't have the MySQL server 1190 # Minimal builds don't have the MySQL server
1123 if ! use minimal ; then 1191 if ! use minimal ; then
1124 einfo "Including support files and sample configurations" 1192 einfo "Including support files and sample configurations"
1136 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
1137 done 1205 done
1138 1206
1139 fi 1207 fi
1140 1208
1141 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
1142} 1210}
1143 1211
1144# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
1145# @DESCRIPTION: 1213# @DESCRIPTION:
1146# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
1160mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1161 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1162 mysql_init_vars 1230 mysql_init_vars
1163 1231
1164 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1165 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 1233 [[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
1166 1234
1167 # Secure the logfiles 1235 # Secure the logfiles
1168 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1169 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1170 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1199 elog "mysql_upgrade tool." 1267 elog "mysql_upgrade tool."
1200 einfo 1268 einfo
1201 fi 1269 fi
1202 1270
1203 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1204 # TODO: explain it better 1272 elog "Note: PBXT is now statically built when enabled."
1205 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1273 elog ""
1206 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1274 elog "If, you previously installed as a plugin and "
1207 elog "if, after that, you cannot start the MySQL server," 1275 elog "you cannot start the MySQL server,"
1208 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1276 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1209 elog "use the MySQL upgrade script to restore the table" 1277 elog "use the MySQL upgrade script to restore the table"
1210 elog "or execute the following SQL command:" 1278 elog "or execute the following SQL command:"
1211 elog " CREATE TABLE IF NOT EXISTS plugin (" 1279 elog " CREATE TABLE IF NOT EXISTS plugin ("
1212 elog " name char(64) binary DEFAULT '' NOT NULL," 1280 elog " name char(64) binary DEFAULT '' NOT NULL,"
1218 mysql_check_version_range "4.0 to 5.0.99.99" \ 1286 mysql_check_version_range "4.0 to 5.0.99.99" \
1219 && use berkdb \ 1287 && use berkdb \
1220 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 1288 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
1221} 1289}
1222 1290
1291# @FUNCTION: mysql_getopt
1292# @DESCRIPTION:
1293# Use my_print_defaults to extract specific config options
1294mysql_getopt() {
1295 local mypd="${EROOT}"/usr/bin/my_print_defaults
1296 section="$1"
1297 flag="--${2}="
1298 "${mypd}" $section | sed -n "/^${flag}/p"
1299}
1300
1301# @FUNCTION: mysql_getoptval
1302# @DESCRIPTION:
1303# Use my_print_defaults to extract specific config options
1304mysql_getoptval() {
1305 local mypd="${EROOT}"/usr/bin/my_print_defaults
1306 section="$1"
1307 flag="--${2}="
1308 "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
1309}
1310
1223# @FUNCTION: mysql_pkg_config 1311# @FUNCTION: mysql_pkg_config
1224# @DESCRIPTION: 1312# @DESCRIPTION:
1225# Configure mysql environment. 1313# Configure mysql environment.
1226mysql_pkg_config() { 1314mysql_pkg_config() {
1227 local old_MY_DATADIR="${MY_DATADIR}" 1315 local old_MY_DATADIR="${MY_DATADIR}"
1316 local old_HOME="${HOME}"
1317 # my_print_defaults needs to read stuff in $HOME/.my.cnf
1318 export HOME=/root
1228 1319
1229 # Make sure the vars are correctly initialized 1320 # Make sure the vars are correctly initialized
1230 mysql_init_vars 1321 mysql_init_vars
1231 1322
1232 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 1323 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
1234 if built_with_use ${CATEGORY}/${PN} minimal ; then 1325 if built_with_use ${CATEGORY}/${PN} minimal ; then
1235 die "Minimal builds do NOT include the MySQL server" 1326 die "Minimal builds do NOT include the MySQL server"
1236 fi 1327 fi
1237 1328
1238 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1329 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1239 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 1330 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
1331 MY_DATADIR_s="${MY_DATADIR_s%%/}"
1240 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 1332 local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
1333 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
1241 1334
1242 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1335 if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
1243 if [[ -d "${MY_DATADIR_s}" ]]; then 1336 if [[ -d "${MY_DATADIR_s}" ]]; then
1244 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1337 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1245 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 1338 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
1246 else 1339 else
1247 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" 1340 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
1259 fi 1352 fi
1260 fi 1353 fi
1261 1354
1262 local pwd1="a" 1355 local pwd1="a"
1263 local pwd2="b" 1356 local pwd2="b"
1264 local MYSQL_ROOT_PASSWORD=''
1265 local maxtry=15 1357 local maxtry=15
1266 1358
1267 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1359 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1268 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")" 1360 MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
1361 fi
1362 MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
1363 # These are dir+prefix
1364 MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
1365 MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
1366 MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
1367 MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
1368
1369 if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
1370 einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
1371 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
1372 fi
1373 if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
1374 einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
1375 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
1376 fi
1377 if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
1378 einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
1379 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
1269 fi 1380 fi
1270 1381
1271 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1382 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1272 ewarn "You have already a MySQL database in place." 1383 ewarn "You have already a MySQL database in place."
1273 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1384 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1279 # localhost. Also causes weird failures. 1390 # localhost. Also causes weird failures.
1280 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1391 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1281 1392
1282 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then 1393 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1283 1394
1284 einfo "Please provide a password for the mysql 'root' user now," 1395 einfo "Please provide a password for the mysql 'root' user now, in the"
1285 einfo "or in the MYSQL_ROOT_PASSWORD env var." 1396 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1286 ewarn "Avoid [\"'\\_%] characters in the password" 1397 ewarn "Avoid [\"'\\_%] characters in the password"
1287 read -rsp " >" pwd1 ; echo 1398 read -rsp " >" pwd1 ; echo
1288 1399
1289 einfo "Retype the password" 1400 einfo "Retype the password"
1290 read -rsp " >" pwd2 ; echo 1401 read -rsp " >" pwd2 ; echo
1294 fi 1405 fi
1295 MYSQL_ROOT_PASSWORD="${pwd1}" 1406 MYSQL_ROOT_PASSWORD="${pwd1}"
1296 unset pwd1 pwd2 1407 unset pwd1 pwd2
1297 fi 1408 fi
1298 1409
1299 local options="" 1410 local options="--log-warnings=0"
1300 local sqltmp="$(emktemp)" 1411 local sqltmp="$(emktemp)"
1301 1412
1302 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" 1413 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
1303 [[ -r "${help_tables}" ]] \ 1414 [[ -r "${help_tables}" ]] \
1304 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1415 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1305 || touch "${TMPDIR}/fill_help_tables.sql" 1416 || touch "${TMPDIR}/fill_help_tables.sql"
1306 help_tables="${TMPDIR}/fill_help_tables.sql" 1417 help_tables="${TMPDIR}/fill_help_tables.sql"
1307 1418
1419 # Figure out which options we need to disable to do the setup
1420 helpfile="${TMPDIR}/mysqld-help"
1421 ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1422 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1423 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1424 ndbcluster log-slave-updates \
1425 ; do
1426 optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
1427 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1428 done
1429 # But some options changed names
1430 egrep -sq external-locking "${helpfile}" && \
1431 options="${options/skip-locking/skip-external-locking}"
1432
1433 use prefix || options="${options} --user=mysql"
1434
1308 pushd "${TMPDIR}" &>/dev/null 1435 pushd "${TMPDIR}" &>/dev/null
1309 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 1436 #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
1437 cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
1438 [ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db
1439 cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
1440 einfo "Command: $cmd"
1441 eval $cmd \
1442 >"${TMPDIR}"/mysql_install_db.log 2>&1
1310 if [ $? -ne 0 ]; then 1443 if [ $? -ne 0 ]; then
1311 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 1444 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1312 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 1445 die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1313 fi 1446 fi
1314 popd &>/dev/null 1447 popd &>/dev/null
1315 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1448 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1316 || die "MySQL databases not installed" 1449 || die "MySQL databases not installed"
1317 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1450 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1318 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1451 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1319 1452
1320 # Figure out which options we need to disable to do the setup
1321 helpfile="${TMPDIR}/mysqld-help"
1322 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1323 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1324 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1325 ndbcluster \
1326 ; do
1327 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1328 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1329 done
1330 # But some options changed names
1331 egrep -sq external-locking "${helpfile}" && \
1332 options="${options/skip-locking/skip-external-locking}"
1333
1334 if mysql_version_is_at_least "4.1.3" ; then 1453 if mysql_version_is_at_least "4.1.3" ; then
1335 # Filling timezones, see 1454 # Filling timezones, see
1336 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1455 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1337 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1456 "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1338 1457
1339 if [[ -r "${help_tables}" ]] ; then 1458 if [[ -r "${help_tables}" ]] ; then
1340 cat "${help_tables}" >> "${sqltmp}" 1459 cat "${help_tables}" >> "${sqltmp}"
1341 fi 1460 fi
1342 fi 1461 fi
1343 1462
1344 einfo "Creating the mysql database and setting proper" 1463 einfo "Creating the mysql database and setting proper"
1345 einfo "permissions on it ..." 1464 einfo "permissions on it ..."
1346 1465
1347 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1466 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1348 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1467 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1349 local mysqld="${ROOT}/usr/sbin/mysqld \ 1468 local mysqld="${EROOT}/usr/sbin/mysqld \
1350 ${options} \ 1469 ${options} \
1351 --user=mysql \ 1470 --user=mysql \
1471 --log-warnings=0 \
1352 --basedir=${ROOT}/usr \ 1472 --basedir=${EROOT}/usr \
1353 --datadir=${ROOT}/${MY_DATADIR} \ 1473 --datadir=${ROOT}/${MY_DATADIR} \
1354 --max_allowed_packet=8M \ 1474 --max_allowed_packet=8M \
1355 --net_buffer_length=16K \ 1475 --net_buffer_length=16K \
1356 --default-storage-engine=MyISAM \ 1476 --default-storage-engine=MyISAM \
1357 --socket=${socket} \ 1477 --socket=${socket} \
1358 --pid-file=${pidfile}" 1478 --pid-file=${pidfile}"
1359 #einfo "About to start mysqld: ${mysqld}" 1479 #einfo "About to start mysqld: ${mysqld}"
1360 ebegin "Starting mysqld" 1480 ebegin "Starting mysqld"
1481 einfo "Command ${mysqld}"
1361 ${mysqld} & 1482 ${mysqld} &
1362 rc=$? 1483 rc=$?
1363 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1484 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1364 maxtry=$((${maxtry}-1)) 1485 maxtry=$((${maxtry}-1))
1365 echo -n "." 1486 echo -n "."
1372 fi 1493 fi
1373 1494
1374 ebegin "Setting root password" 1495 ebegin "Setting root password"
1375 # Do this from memory, as we don't want clear text passwords in temp files 1496 # Do this from memory, as we don't want clear text passwords in temp files
1376 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" 1497 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1377 "${ROOT}/usr/bin/mysql" \ 1498 "${EROOT}/usr/bin/mysql" \
1378 --socket=${socket} \ 1499 --socket=${socket} \
1379 -hlocalhost \ 1500 -hlocalhost \
1380 -e "${sql}" 1501 -e "${sql}"
1381 eend $? 1502 eend $?
1382 1503
1383 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1504 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1384 "${ROOT}/usr/bin/mysql" \ 1505 "${EROOT}/usr/bin/mysql" \
1385 --socket=${socket} \ 1506 --socket=${socket} \
1386 -hlocalhost \ 1507 -hlocalhost \
1387 -uroot \ 1508 -uroot \
1388 -p"${MYSQL_ROOT_PASSWORD}" \ 1509 --password="${MYSQL_ROOT_PASSWORD}" \
1389 mysql < "${sqltmp}" 1510 mysql < "${sqltmp}"
1390 rc=$? 1511 rc=$?
1391 eend $? 1512 eend $?
1392 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!" 1513 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1393 1514
1401 1522
1402# @FUNCTION: mysql_pkg_postrm 1523# @FUNCTION: mysql_pkg_postrm
1403# @DESCRIPTION: 1524# @DESCRIPTION:
1404# Remove mysql symlinks. 1525# Remove mysql symlinks.
1405mysql_pkg_postrm() { 1526mysql_pkg_postrm() {
1406 : # mysql_lib_symlinks "${D}" 1527 : # mysql_lib_symlinks "${ED}"
1407} 1528}

Legend:
Removed from v.1.153  
changed lines
  Added in v.1.176

  ViewVC Help
Powered by ViewVC 1.1.20