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

Diff of /eclass/mysql.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20