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

Diff of /eclass/mysql.eclass

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

Revision 1.163 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.163 2011/08/21 16:14:56 jmbsvicetto 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 )"
147 149
148DEPEND="${DEPEND} 150DEPEND="${DEPEND}
149 virtual/yacc" 151 virtual/yacc"
150 152
151if [ "${EAPI:-0}" = "2" ]; then 153if [ "${EAPI:-0}" = "2" ]; then
152 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" 154 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
153fi 155fi
154 156
155# compile-time-only 157# compile-time-only
156mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
157|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
360# @DESCRIPTION: 362# @DESCRIPTION:
361# void mysql_init_vars() 363# void mysql_init_vars()
362# Initialize global variables 364# Initialize global variables
363# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
364mysql_init_vars() { 366mysql_init_vars() {
365 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
366 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
367 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
368 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
369 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
370 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
371 373
372 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
373 MY_DATADIR="" 375 MY_DATADIR=""
374 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
375 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
376 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
377 | tail -n1` 379 | tail -n1`
378 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
379 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
380 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
381 | tail -n1` 383 | tail -n1`
382 fi 384 fi
383 fi 385 fi
384 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
456 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
457 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
458 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
459 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
460 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
461 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
462 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
463 465
464 if use static ; then 466 if use static ; then
465 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
466 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
501 fi 503 fi
502 504
503} 505}
504 506
505configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
506 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
507 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
508 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
509 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
510 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
511 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
512 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)"
513 516
514 # --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
515 # has been removed from configure 518 # has been removed from configure
516 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
582 585
583configure_51() { 586configure_51() {
584 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
585 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
586 # readline.h instead of history.h 589 # readline.h instead of history.h
587 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
588 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
589 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
590 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
591 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
592 myconf="${myconf} --without-pstack" 595 myconf="${myconf} --without-pstack"
593 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" 596 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
594 597
595 # This is an explict die here, because if we just forcibly disable it, then the 598 # This is an explict die here, because if we just forcibly disable it, then the
596 # user's data is not accessible. 599 # user's data is not accessible.
597 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently" 600 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
598 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
616 \) \ 619 \) \
617 -print0 \ 620 -print0 \
618 | xargs -0 sed -r -n \ 621 | xargs -0 sed -r -n \
619 -e '/^MYSQL_STORAGE_ENGINE/{ 622 -e '/^MYSQL_STORAGE_ENGINE/{
620 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ; 623 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
621 s~^([^ ]+).*~\1~gp; 624 s~^([^ ]+).*~\1~gp;
622 }' \ 625 }' \
623 | tr -s '\n' ' ' 626 | tr -s '\n' ' '
624 )" 627 )"
625 628
626 # 5.1 introduces a new way to manage storage engines (plugins) 629 # 5.1 introduces a new way to manage storage engines (plugins)
709 fi 712 fi
710 fi 713 fi
711 714
712 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then 715 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
713 use pbxt \ 716 use pbxt \
714 && plugins_dyn="${plugins_dyn} pbxt" \ 717 && plugins_sta="${plugins_sta} pbxt" \
715 || plugins_dis="${plugins_dis} pbxt" 718 || plugins_dis="${plugins_dis} pbxt"
716 fi 719 fi
717 720
718 use static && \ 721 use static && \
719 plugins_sta="${plugins_sta} ${plugins_dyn}" && \ 722 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
739 742
740 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
741 eautoreconf 744 eautoreconf
742 745
743 local myconf="" 746 local myconf=""
744 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
745 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
746 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
747} 750}
748 751
749pbxt_src_compile() { 752pbxt_src_compile() {
785 fi 788 fi
786 789
787 # bug 350844 790 # bug 350844
788 case "${EAPI:-0}" in 791 case "${EAPI:-0}" in
789 0 | 1) 792 0 | 1)
790 if use static && !built_with_use sys-libs/ncurses static-libs; then 793 if use static && ! built_with_use sys-libs/ncurses static-libs; then
791 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses" 794 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
792 fi 795 fi
793 ;; 796 ;;
794 esac 797 esac
795 798
835 # Bug #290570, 284946, 307251 838 # Bug #290570, 284946, 307251
836 # Upstream changes made us need a fairly new GCC4. 839 # Upstream changes made us need a fairly new GCC4.
837 # But only for 5.0.8[3-6]! 840 # But only for 5.0.8[3-6]!
838 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
839 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
840 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
844 *-darwin*:4.*) : ;; # bug #310615
841 2*|3*|4.0|4.1|4.2) 845 *:2*|*:3*|*:4.0|*:4.1|*:4.2)
842 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"
843 eerror "later release relaxed that requirement again. Either pick a" 847 eerror "later release relaxed that requirement again. Either pick a"
844 eerror "MySQL >=5.0.87, or use a newer GCC." 848 eerror "MySQL >=5.0.87, or use a newer GCC."
845 die "Active GCC too old!" ;; 849 die "Active GCC too old!" ;;
846 esac 850 esac
974 978
975 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" \
976 && use berkdb ; then 980 && use berkdb ; then
977 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
978 [[ -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"
979 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" \
980 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
981 #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.
982 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
983 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
984 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
985 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"
986 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
987 fi 991 fi
988 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
989 sh s_all \ 993 sh s_all \
990 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
991 popd &>/dev/null 995 popd &>/dev/null
1042 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \ 1046 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1043 append-flags -fno-omit-frame-pointer && \ 1047 append-flags -fno-omit-frame-pointer && \
1044 filter-flags -fomit-frame-pointer 1048 filter-flags -fomit-frame-pointer
1045 1049
1046 econf \ 1050 econf \
1047 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
1048 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
1049 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
1050 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
1051 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
1052 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
1053 --with-low-memory \ 1057 --with-low-memory \
1054 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
1055 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
1056 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
1057 --without-docs \ 1061 --without-docs \
1092 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
1093 mysql_init_vars 1097 mysql_init_vars
1094 1098
1095 emake install \ 1099 emake install \
1096 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
1097 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
1098 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
1099 || die "emake install failed" 1103 || die "emake install failed"
1100 1104
1101 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1102 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1108 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1109 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
1110 1114
1111 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
1112 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
1113 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
1114 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
1115 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
1116 do 1120 do
1117 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
1118 done 1122 done
1119 1123
1120 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
1121 if use minimal ; then 1125 if use minimal ; then
1122 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
1123 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
1124 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}
1125 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
1126 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
1127 fi 1131 fi
1128 1132
1129 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
1130 # 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
1138 3*|4.0) mysql_mycnf_version="4.0" ;; 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
1139 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;; 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
1140 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;; 1144 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1141 esac 1145 esac
1142 einfo "Building default my.cnf (${mysql_mycnf_version})" 1146 einfo "Building default my.cnf (${mysql_mycnf_version})"
1143 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
1144 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1145 mycnf_src="my.cnf-${mysql_mycnf_version}" 1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
1146 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!" \
1147 "${FILESDIR}/${mycnf_src}" \ 1154 "${FILESDIR}/${mycnf_src}" \
1148 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
1149 if use latin1 ; then 1157 if use latin1 ; then
1150 sed -i \ 1158 sed -i \
1151 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
1152 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
1153 fi 1161 fi
1157 if ! use minimal ; then 1165 if ! use minimal ; then
1158 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
1159 # Empty directories ... 1167 # Empty directories ...
1160 diropts "-m0750" 1168 diropts "-m0750"
1161 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
1162 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
1163 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
1164 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
1165 fi 1173 fi
1166 1174
1167 diropts "-m0755" 1175 diropts "-m0755"
1168 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
1169 dodir "${folder}" 1177 dodir "${folder}"
1170 keepdir "${folder}" 1178 keepdir "${folder}"
1171 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
1172 done 1180 done
1173 fi 1181 fi
1174 1182
1175 # Docs 1183 # Docs
1176 einfo "Installing docs" 1184 einfo "Installing docs"
1196 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
1197 done 1205 done
1198 1206
1199 fi 1207 fi
1200 1208
1201 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
1202} 1210}
1203 1211
1204# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
1205# @DESCRIPTION: 1213# @DESCRIPTION:
1206# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
1220mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1221 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1222 mysql_init_vars 1230 mysql_init_vars
1223 1231
1224 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1225 [[ -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}"
1226 1234
1227 # Secure the logfiles 1235 # Secure the logfiles
1228 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1229 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1230 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1259 elog "mysql_upgrade tool." 1267 elog "mysql_upgrade tool."
1260 einfo 1268 einfo
1261 fi 1269 fi
1262 1270
1263 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1264 # TODO: explain it better 1272 elog "Note: PBXT is now statically built when enabled."
1265 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1273 elog ""
1266 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1274 elog "If, you previously installed as a plugin and "
1267 elog "if, after that, you cannot start the MySQL server," 1275 elog "you cannot start the MySQL server,"
1268 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1276 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1269 elog "use the MySQL upgrade script to restore the table" 1277 elog "use the MySQL upgrade script to restore the table"
1270 elog "or execute the following SQL command:" 1278 elog "or execute the following SQL command:"
1271 elog " CREATE TABLE IF NOT EXISTS plugin (" 1279 elog " CREATE TABLE IF NOT EXISTS plugin ("
1272 elog " name char(64) binary DEFAULT '' NOT NULL," 1280 elog " name char(64) binary DEFAULT '' NOT NULL,"
1278 mysql_check_version_range "4.0 to 5.0.99.99" \ 1286 mysql_check_version_range "4.0 to 5.0.99.99" \
1279 && use berkdb \ 1287 && use berkdb \
1280 && 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!"
1281} 1289}
1282 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
1283# @FUNCTION: mysql_pkg_config 1311# @FUNCTION: mysql_pkg_config
1284# @DESCRIPTION: 1312# @DESCRIPTION:
1285# Configure mysql environment. 1313# Configure mysql environment.
1286mysql_pkg_config() { 1314mysql_pkg_config() {
1287 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
1288 1319
1289 # Make sure the vars are correctly initialized 1320 # Make sure the vars are correctly initialized
1290 mysql_init_vars 1321 mysql_init_vars
1291 1322
1292 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 1323 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
1294 if built_with_use ${CATEGORY}/${PN} minimal ; then 1325 if built_with_use ${CATEGORY}/${PN} minimal ; then
1295 die "Minimal builds do NOT include the MySQL server" 1326 die "Minimal builds do NOT include the MySQL server"
1296 fi 1327 fi
1297 1328
1298 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1329 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1299 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%%/}"
1300 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%%/}"
1301 1334
1302 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1335 if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
1303 if [[ -d "${MY_DATADIR_s}" ]]; then 1336 if [[ -d "${MY_DATADIR_s}" ]]; then
1304 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1337 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1305 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}"
1306 else 1339 else
1307 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}"
1321 1354
1322 local pwd1="a" 1355 local pwd1="a"
1323 local pwd2="b" 1356 local pwd2="b"
1324 local maxtry=15 1357 local maxtry=15
1325 1358
1326 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1359 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1327 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
1328 fi 1380 fi
1329 1381
1330 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1382 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1331 ewarn "You have already a MySQL database in place." 1383 ewarn "You have already a MySQL database in place."
1332 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1384 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1353 fi 1405 fi
1354 MYSQL_ROOT_PASSWORD="${pwd1}" 1406 MYSQL_ROOT_PASSWORD="${pwd1}"
1355 unset pwd1 pwd2 1407 unset pwd1 pwd2
1356 fi 1408 fi
1357 1409
1358 local options="" 1410 local options="--log-warnings=0"
1359 local sqltmp="$(emktemp)" 1411 local sqltmp="$(emktemp)"
1360 1412
1361 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" 1413 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
1362 [[ -r "${help_tables}" ]] \ 1414 [[ -r "${help_tables}" ]] \
1363 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1415 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1364 || touch "${TMPDIR}/fill_help_tables.sql" 1416 || touch "${TMPDIR}/fill_help_tables.sql"
1365 help_tables="${TMPDIR}/fill_help_tables.sql" 1417 help_tables="${TMPDIR}/fill_help_tables.sql"
1366 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
1367 pushd "${TMPDIR}" &>/dev/null 1435 pushd "${TMPDIR}" &>/dev/null
1368 "${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
1369 if [ $? -ne 0 ]; then 1443 if [ $? -ne 0 ]; then
1370 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
1371 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"
1372 fi 1446 fi
1373 popd &>/dev/null 1447 popd &>/dev/null
1374 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1448 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1375 || die "MySQL databases not installed" 1449 || die "MySQL databases not installed"
1376 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1450 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1377 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1451 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1378 1452
1379 # Figure out which options we need to disable to do the setup
1380 helpfile="${TMPDIR}/mysqld-help"
1381 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1382 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1383 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1384 ndbcluster \
1385 ; do
1386 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1387 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1388 done
1389 # But some options changed names
1390 egrep -sq external-locking "${helpfile}" && \
1391 options="${options/skip-locking/skip-external-locking}"
1392
1393 if mysql_version_is_at_least "4.1.3" ; then 1453 if mysql_version_is_at_least "4.1.3" ; then
1394 # Filling timezones, see 1454 # Filling timezones, see
1395 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1455 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1396 "${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
1397 1457
1398 if [[ -r "${help_tables}" ]] ; then 1458 if [[ -r "${help_tables}" ]] ; then
1399 cat "${help_tables}" >> "${sqltmp}" 1459 cat "${help_tables}" >> "${sqltmp}"
1400 fi 1460 fi
1401 fi 1461 fi
1402 1462
1403 einfo "Creating the mysql database and setting proper" 1463 einfo "Creating the mysql database and setting proper"
1404 einfo "permissions on it ..." 1464 einfo "permissions on it ..."
1405 1465
1406 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1466 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1407 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1467 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1408 local mysqld="${ROOT}/usr/sbin/mysqld \ 1468 local mysqld="${EROOT}/usr/sbin/mysqld \
1409 ${options} \ 1469 ${options} \
1410 --user=mysql \ 1470 --user=mysql \
1471 --log-warnings=0 \
1411 --basedir=${ROOT}/usr \ 1472 --basedir=${EROOT}/usr \
1412 --datadir=${ROOT}/${MY_DATADIR} \ 1473 --datadir=${ROOT}/${MY_DATADIR} \
1413 --max_allowed_packet=8M \ 1474 --max_allowed_packet=8M \
1414 --net_buffer_length=16K \ 1475 --net_buffer_length=16K \
1415 --default-storage-engine=MyISAM \ 1476 --default-storage-engine=MyISAM \
1416 --socket=${socket} \ 1477 --socket=${socket} \
1417 --pid-file=${pidfile}" 1478 --pid-file=${pidfile}"
1418 #einfo "About to start mysqld: ${mysqld}" 1479 #einfo "About to start mysqld: ${mysqld}"
1419 ebegin "Starting mysqld" 1480 ebegin "Starting mysqld"
1481 einfo "Command ${mysqld}"
1420 ${mysqld} & 1482 ${mysqld} &
1421 rc=$? 1483 rc=$?
1422 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1484 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1423 maxtry=$((${maxtry}-1)) 1485 maxtry=$((${maxtry}-1))
1424 echo -n "." 1486 echo -n "."
1431 fi 1493 fi
1432 1494
1433 ebegin "Setting root password" 1495 ebegin "Setting root password"
1434 # 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
1435 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'"
1436 "${ROOT}/usr/bin/mysql" \ 1498 "${EROOT}/usr/bin/mysql" \
1437 --socket=${socket} \ 1499 --socket=${socket} \
1438 -hlocalhost \ 1500 -hlocalhost \
1439 -e "${sql}" 1501 -e "${sql}"
1440 eend $? 1502 eend $?
1441 1503
1442 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1504 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1443 "${ROOT}/usr/bin/mysql" \ 1505 "${EROOT}/usr/bin/mysql" \
1444 --socket=${socket} \ 1506 --socket=${socket} \
1445 -hlocalhost \ 1507 -hlocalhost \
1446 -uroot \ 1508 -uroot \
1447 -p"${MYSQL_ROOT_PASSWORD}" \ 1509 --password="${MYSQL_ROOT_PASSWORD}" \
1448 mysql < "${sqltmp}" 1510 mysql < "${sqltmp}"
1449 rc=$? 1511 rc=$?
1450 eend $? 1512 eend $?
1451 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!" 1513 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1452 1514
1460 1522
1461# @FUNCTION: mysql_pkg_postrm 1523# @FUNCTION: mysql_pkg_postrm
1462# @DESCRIPTION: 1524# @DESCRIPTION:
1463# Remove mysql symlinks. 1525# Remove mysql symlinks.
1464mysql_pkg_postrm() { 1526mysql_pkg_postrm() {
1465 : # mysql_lib_symlinks "${D}" 1527 : # mysql_lib_symlinks "${ED}"
1466} 1528}

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

  ViewVC Help
Powered by ViewVC 1.1.20