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

Diff of /eclass/mysql.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20