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

Diff of /eclass/mysql.eclass

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

Revision 1.138 Revision 1.155
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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/Attic/mysql.eclass,v 1.138 2010/03/15 19:05:51 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.155 2010/11/02 20:27:41 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
59# Upstream MySQL considers the first two parts of the version number to be the 59# Upstream MySQL considers the first two parts of the version number to be the
60# major version. Upgrades that change major version should always run 60# major version. Upgrades that change major version should always run
61# mysql_upgrade. 61# mysql_upgrade.
62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" 62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
63 63
64# Cluster is a special case...
65if [[ "${PN}" == "mysql-cluster" ]]; then
66 case $PV in
67 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
68 esac
69fi
70
71
64# @ECLASS-VARIABLE: MYSQL_VERSION_ID 72# @ECLASS-VARIABLE: MYSQL_VERSION_ID
65# @DESCRIPTION: 73# @DESCRIPTION:
66# MYSQL_VERSION_ID will be: 74# MYSQL_VERSION_ID will be:
67# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 75# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
68# This is an important part, because many of the choices the MySQL ebuild will do 76# This is an important part, because many of the choices the MySQL ebuild will do
95 MYSQL_COMMUNITY_FEATURES=1 103 MYSQL_COMMUNITY_FEATURES=1
96elif [ "${PV#5.4}" != "${PV}" ] ; then 104elif [ "${PV#5.4}" != "${PV}" ] ; then
97 MYSQL_COMMUNITY_FEATURES=1 105 MYSQL_COMMUNITY_FEATURES=1
98elif [ "${PV#5.5}" != "${PV}" ] ; then 106elif [ "${PV#5.5}" != "${PV}" ] ; then
99 MYSQL_COMMUNITY_FEATURES=1 107 MYSQL_COMMUNITY_FEATURES=1
100elif [ "${PV#6.0}" != "${PV}" ] ; then 108elif [ "${PV#6}" != "${PV}" ] ; then
109 MYSQL_COMMUNITY_FEATURES=1
110elif [ "${PV#7}" != "${PV}" ] ; then
101 MYSQL_COMMUNITY_FEATURES=1 111 MYSQL_COMMUNITY_FEATURES=1
102else 112else
103 MYSQL_COMMUNITY_FEATURES=0 113 MYSQL_COMMUNITY_FEATURES=0
104fi 114fi
105 115
124 134
125[[ "${PN}" == "mariadb" ]] \ 135[[ "${PN}" == "mariadb" ]] \
126&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" 136&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
127 137
128# Having different flavours at the same time is not a good idea 138# Having different flavours at the same time is not a good idea
129for i in "mysql" "mysql-community" "mariadb" ; do 139for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
130 [[ "${i}" == ${PN} ]] || 140 [[ "${i}" == ${PN} ]] ||
131 DEPEND="${DEPEND} !dev-db/${i}" 141 DEPEND="${DEPEND} !dev-db/${i}"
132done 142done
133 143
134RDEPEND="${DEPEND} 144RDEPEND="${DEPEND}
152# Work out the default SERVER_URI correctly 162# Work out the default SERVER_URI correctly
153if [ -z "${SERVER_URI}" ]; then 163if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 164 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 165 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 166 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
167 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
168 SERVER_URI="
169 http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
170 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
171 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
157 SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz" 172 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
173 http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
174 http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
175 "
158 # The community build is on the mirrors 176 # The community and cluster builds are on the mirrors
159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 177 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" 178 if [[ "${PN}" == "mysql-cluster" ]] ; then
179 URI_DIR="MySQL-Cluster"
180 URI_FILE="mysql-cluster-gpl"
181 else
182 URI_DIR="MySQL"
183 URI_FILE="mysql"
184 fi
185 URI_A="${URI_FILE}-${MY_PV}.tar.gz"
186 MIRROR_PV=$(get_version_component_range 1-2 ${PV})
187 # Recently upstream switched to an archive site, and not on mirrors
188 SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
189 mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
161 # The (old) enterprise source is on the primary site only 190 # The (old) enterprise source is on the primary site only
162 elif [ "${PN}" == "mysql" ]; then 191 elif [ "${PN}" == "mysql" ]; then
163 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" 192 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
164 fi 193 fi
165fi 194fi
178HOMEPAGE="http://www.mysql.com/" 207HOMEPAGE="http://www.mysql.com/"
179if [[ "${PN}" == "mariadb" ]]; then 208if [[ "${PN}" == "mariadb" ]]; then
180 HOMEPAGE="http://askmonty.org/" 209 HOMEPAGE="http://askmonty.org/"
181 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged." 210 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
182fi 211fi
212if [[ "${PN}" == "mysql-community" ]]; then
213 DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
214fi
183LICENSE="GPL-2" 215LICENSE="GPL-2"
184SLOT="0" 216SLOT="0"
185IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test" 217IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
186 218
187mysql_version_is_at_least "4.1" \ 219mysql_version_is_at_least "4.1" \
188&& IUSE="${IUSE} latin1" 220&& IUSE="${IUSE} latin1"
189 221
190mysql_version_is_at_least "4.1.3" \ 222if mysql_version_is_at_least "4.1.3" ; then
191&& IUSE="${IUSE} cluster extraengine" 223 IUSE="${IUSE} extraengine"
224 if [[ "${PN}" != "mysql-cluster" ]] ; then
225 IUSE="${IUSE} cluster"
226 fi
227fi
192 228
193mysql_version_is_at_least "5.0" \ 229mysql_version_is_at_least "5.0" \
194|| IUSE="${IUSE} raid" 230|| IUSE="${IUSE} raid"
195 231
196mysql_version_is_at_least "5.0.18" \ 232mysql_version_is_at_least "5.0.18" \
229 && mysql_version_is_at_least "5.1.26" \ 265 && mysql_version_is_at_least "5.1.26" \
230 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 266 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
231 return $? 267 return $?
232} 268}
233 269
270
234pbxt_patch_available \ 271pbxt_patch_available \
235&& PBXT_P="pbxt-${PBXT_VERSION}" \ 272&& PBXT_P="pbxt-${PBXT_VERSION}" \
236&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ 273&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
237&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \ 274&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
238 275
276# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
277# vs. built outside the dir
239pbxt_available \ 278pbxt_available \
240&& IUSE="${IUSE} pbxt" 279&& IUSE="${IUSE} pbxt" \
280&& mysql_version_is_at_least "5.1.40" \
281&& PBXT_NEWSTYLE=1
241 282
242xtradb_patch_available \ 283xtradb_patch_available \
243&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 284&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
244&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 285&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
245&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \ 286&& XTRADB_SRC_B1="http://www.percona.com/" \
287&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
288&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
246&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \ 289&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
290&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
247&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \ 291&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
248&& IUSE="${IUSE} xtradb" 292&& IUSE="${IUSE} xtradb"
249 293
250# 294#
251# HELPER FUNCTIONS: 295# HELPER FUNCTIONS:
252# 296#
257mysql_disable_test() { 301mysql_disable_test() {
258 local rawtestname testname testsuite reason mysql_disable_file 302 local rawtestname testname testsuite reason mysql_disable_file
259 rawtestname="${1}" ; shift 303 rawtestname="${1}" ; shift
260 reason="${@}" 304 reason="${@}"
261 ewarn "test '${rawtestname}' disabled: '${reason}'" 305 ewarn "test '${rawtestname}' disabled: '${reason}'"
262 306
263 testsuite="${rawtestname/.*}" 307 testsuite="${rawtestname/.*}"
264 testname="${rawtestname/*.}" 308 testname="${rawtestname/*.}"
265 mysql_disable_file="${S}/mysql-test/t/disabled.def" 309 mysql_disable_file="${S}/mysql-test/t/disabled.def"
266 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 310 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
267 echo ${testname} : ${reason} >> "${mysql_disable_file}" 311 echo ${testname} : ${reason} >> "${mysql_disable_file}"
349 MY_DATADIR="${new_MY_DATADIR}" 393 MY_DATADIR="${new_MY_DATADIR}"
350 fi 394 fi
351 fi 395 fi
352 fi 396 fi
353 397
398 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
354 MY_SOURCEDIR=${SERVER_URI##*/} 399 MY_SOURCEDIR=${SERVER_URI##*/}
355 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 400 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
401 fi
356 402
357 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 403 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
358 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 404 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
359 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 405 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
360} 406}
407 if use debug ; then 453 if use debug ; then
408 myconf="${myconf} --with-debug=full" 454 myconf="${myconf} --with-debug=full"
409 else 455 else
410 myconf="${myconf} --without-debug" 456 myconf="${myconf} --without-debug"
411 mysql_version_is_at_least "4.1.3" \ 457 mysql_version_is_at_least "4.1.3" \
412 && use cluster \ 458 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
413 && myconf="${myconf} --without-ndb-debug" 459 && myconf="${myconf} --without-ndb-debug"
414 fi 460 fi
415 461
416 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 462 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
417 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 463 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
474 myconf="${myconf} --without-berkeley-db" 520 myconf="${myconf} --without-berkeley-db"
475 fi 521 fi
476 522
477 if mysql_version_is_at_least "4.1.3" ; then 523 if mysql_version_is_at_least "4.1.3" ; then
478 myconf="${myconf} --with-geometry" 524 myconf="${myconf} --with-geometry"
525 if [[ "${PN}" != "mysql-cluster" ]] ; then
479 myconf="${myconf} $(use_with cluster ndbcluster)" 526 myconf="${myconf} $(use_with cluster ndbcluster)"
527 fi
480 fi 528 fi
481 529
482 if mysql_version_is_at_least "4.1.3" && use extraengine ; then 530 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
483 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 531 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
484 myconf="${myconf} --with-archive-storage-engine" 532 myconf="${myconf} --with-archive-storage-engine"
521 myconf="${myconf} --enable-assembler" 569 myconf="${myconf} --enable-assembler"
522 myconf="${myconf} --with-geometry" 570 myconf="${myconf} --with-geometry"
523 myconf="${myconf} --with-readline" 571 myconf="${myconf} --with-readline"
524 myconf="${myconf} --with-zlib-dir=/usr/" 572 myconf="${myconf} --with-zlib-dir=/usr/"
525 myconf="${myconf} --without-pstack" 573 myconf="${myconf} --without-pstack"
574 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
575
576 # This is an explict die here, because if we just forcibly disable it, then the
577 # user's data is not accessible.
578 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
526 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 579 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
527 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 580 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
528 myconf="${myconf} $(use_enable community community-features)" 581 myconf="${myconf} $(use_enable community community-features)"
529 if use community; then 582 if use community; then
530 myconf="${myconf} $(use_enable profiling)" 583 myconf="${myconf} $(use_enable profiling)"
531 else 584 else
532 myconf="${myconf} --disable-profiling" 585 myconf="${myconf} --disable-profiling"
533 fi 586 fi
534 fi 587 fi
535 588
589 # Scan for all available plugins
590 local plugins_avail="$(
591 LANG=C \
592 find "${S}" \
593 \( \
594 -name 'plug.in' \
595 -o -iname 'configure.in' \
596 -o -iname 'configure.ac' \
597 \) \
598 -print0 \
599 | xargs -0 sed -r -n \
600 -e '/^MYSQL_STORAGE_ENGINE/{
601 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
602 s~^([^ ]+).*~\1~gp;
603 }' \
604 | tr -s '\n' ' '
605 )"
606
536 # 5.1 introduces a new way to manage storage engines (plugins) 607 # 5.1 introduces a new way to manage storage engines (plugins)
537 # like configuration=none 608 # like configuration=none
609 # This base set are required, and will always be statically built.
538 local plugins="csv,myisam,myisammrg,heap" 610 local plugins_sta="csv myisam myisammrg heap"
611 local plugins_dyn=""
612 local plugins_dis="example ibmdb2i"
613
614 # These aren't actually required by the base set, but are really useful:
615 plugins_sta="${plugins_sta} archive blackhole"
616
617 # default in 5.5.4
618 if mysql_version_is_at_least "5.5.4" ; then
619 plugins_sta="${plugins_sta} partition"
620 fi
621 # Now the extras
539 if use extraengine ; then 622 if use extraengine ; then
540 # like configuration=max-no-ndb, archive and example removed in 5.1.11 623 # like configuration=max-no-ndb, archive and example removed in 5.1.11
541 # not added yet: ibmdb2i 624 # not added yet: ibmdb2i
542 # Not supporting as examples: example,daemon_example,ftexample 625 # Not supporting as examples: example,daemon_example,ftexample
543 plugins="${plugins},archive,blackhole,federated,partition" 626 plugins_sta="${plugins_sta} partition"
627 plugins_dyn="${plugins_sta} federated"
544 628
545 if [[ "${PN}" != "mariadb" ]] ; then 629 if [[ "${PN}" != "mariadb" ]] ; then
546 elog "Before using the Federated storage engine, please be sure to read" 630 elog "Before using the Federated storage engine, please be sure to read"
547 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 631 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
548 else 632 else
549 elog "MariaDB includes the FederatedX engine. Be sure to read" 633 elog "MariaDB includes the FederatedX engine. Be sure to read"
550 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 634 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
551 fi 635 fi
636 else
637 plugins_dis="${plugins_dis} partition federated"
552 fi 638 fi
553 639
554 # Upstream specifically requests that InnoDB always be built: 640 # Upstream specifically requests that InnoDB always be built:
555 # - innobase, innodb_plugin 641 # - innobase, innodb_plugin
556 # Build falcon if available for 6.x series. 642 # Build falcon if available for 6.x series.
557 for i in innobase innodb_plugin falcon ; do 643 for i in innobase falcon ; do
558 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 644 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
559 done 645 done
646 for i in innodb_plugin ; do
647 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
648 done
560 649
561 # like configuration=max-no-ndb 650 # like configuration=max-no-ndb
562 if use cluster ; then 651 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
563 plugins="${plugins},ndbcluster" 652 plugins_sta="${plugins_sta} ndbcluster partition"
653 plugins_dis="${plugins_dis//partition}"
564 myconf="${myconf} --with-ndb-binlog" 654 myconf="${myconf} --with-ndb-binlog"
655 else
656 plugins_dis="${plugins_dis} ndbcluster"
565 fi 657 fi
566 658
567 if [[ "${PN}" == "mariadb" ]] ; then 659 if [[ "${PN}" == "mariadb" ]] ; then
568 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 660 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
569 # caught above. 661 # caught above.
570 plugins="${plugins},maria,innobase" 662 plugins_sta="${plugins_sta} maria"
571 if use pbxt ; then 663
572 plugins="${plugins},pbxt" 664 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
573 else 665 die "The ${P} package doesn't provide innobase nor xtradb"
574 myconf="${myconf} --without-plugin-pbxt" 666
575 fi 667 for i in innobase xtradb ; do
668 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
669 done
670
576 myconf="${myconf} $(use_with libevent)" 671 myconf="${myconf} $(use_with libevent)"
577 # This is not optional, without it several upstream testcases fail. 672 # This is not optional, without it several upstream testcases fail.
578 # Also strongly recommended by upstream. 673 # Also strongly recommended by upstream.
579 myconf="${myconf} --with-maria-tmp-tables" 674 myconf="${myconf} --with-maria-tmp-tables"
580 fi 675 fi
581 676
677 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
678 use pbxt \
679 && plugins_dyn="${plugins_dyn} pbxt" \
680 || plugins_dis="${plugins_dis} pbxt"
681 fi
682
683 use static && \
684 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
685 plugins_dyn=""
686
687 einfo "Available plugins: ${plugins_avail}"
688 einfo "Dynamic plugins: ${plugins_dyn}"
689 einfo "Static plugins: ${plugins_sta}"
690 einfo "Disabled plugins: ${plugins_dis}"
691
692 # These are the static plugins
582 myconf="${myconf} --with-plugins=${plugins}" 693 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
694 # And the disabled ones
695 for i in ${plugins_dis} ; do
696 myconf="${myconf} --without-plugin-${i}"
697 done
583} 698}
584 699
585pbxt_src_configure() { 700pbxt_src_configure() {
586 mysql_init_vars 701 mysql_init_vars
587 702
588 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 703 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
589 704
590 einfo "Reconfiguring dir '${PWD}'" 705 einfo "Reconfiguring dir '${PWD}'"
591 AT_GNUCONF_UPDATE="yes" eautoreconf 706 eautoreconf
592 707
593 local myconf="" 708 local myconf=""
594 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 709 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
595 use debug && myconf="${myconf} --with-debug=full" 710 use debug && myconf="${myconf} --with-debug=full"
596 econf ${myconf} || die "Problem configuring PBXT storage engine" 711 econf ${myconf} || die "Problem configuring PBXT storage engine"
597} 712}
598 713
599pbxt_src_compile() { 714pbxt_src_compile() {
715
600 # Be backwards compatible for now 716 # Be backwards compatible for now
601 if [[ $EAPI != 2 ]]; then 717 if [[ $EAPI != 2 ]]; then
602 pbxt_src_configure 718 pbxt_src_configure
603 fi 719 fi
604 # TODO: is it safe/needed to use emake here ? 720 # TODO: is it safe/needed to use emake here ?
633 fi 749 fi
634 fi 750 fi
635 751
636 # Check for USE flag problems in pkg_setup 752 # Check for USE flag problems in pkg_setup
637 if use static && use ssl ; then 753 if use static && use ssl ; then
638 eerror "MySQL does not support being built statically with SSL support enabled!"
639 die "MySQL does not support being built statically with SSL support enabled!" 754 M="MySQL does not support being built statically with SSL support enabled!"
755 eerror "${M}"
756 die "${M}"
640 fi 757 fi
641 758
642 if ! mysql_version_is_at_least "5.0" \ 759 if ! mysql_version_is_at_least "5.0" \
643 && use raid \ 760 && use raid \
644 && use static ; then 761 && use static ; then
646 eerror "with RAID support enabled." 763 eerror "with RAID support enabled."
647 die "USE flags 'raid' and 'static' conflict!" 764 die "USE flags 'raid' and 'static' conflict!"
648 fi 765 fi
649 766
650 if mysql_version_is_at_least "4.1.3" \ 767 if mysql_version_is_at_least "4.1.3" \
651 && ( use cluster || use extraengine ) \ 768 && ( use cluster || use extraengine || use embedded ) \
652 && use minimal ; then 769 && use minimal ; then
653 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
654 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 770 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
771 eerror "${M}"
772 die "${M}"
655 fi 773 fi
656 774
657 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
658 if mysql_version_is_at_least "5.0.83" ; then 775 if mysql_version_is_at_least "5.1" \
776 && xtradb_patch_available \
777 && use xtradb \
778 && use embedded ; then
779 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
780 eerror "${M}"
781 die "${M}"
782 fi
783
784 # Bug #290570, 284946, 307251
785 # Upstream changes made us need a fairly new GCC4.
786 # But only for 5.0.8[3-6]!
787 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
659 GCC_VER=$(gcc-version) 788 GCC_VER=$(gcc-version)
660 case ${GCC_VER} in 789 case ${GCC_VER} in
661 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 790 2*|3*|4.0|4.1|4.2)
791 eerror "Some releases of MySQL required a very new GCC, and then"
792 eerror "later release relaxed that requirement again. Either pick a"
793 eerror "MySQL >=5.0.87, or use a newer GCC."
794 die "Active GCC too old!" ;;
662 esac 795 esac
663 fi 796 fi
664 797
665 # This should come after all of the die statements 798 # This should come after all of the die statements
666 enewgroup mysql 60 || die "problem adding 'mysql' group" 799 enewgroup mysql 60 || die "problem adding 'mysql' group"
716 mysql_mv_patches 849 mysql_mv_patches
717 # And apply 850 # And apply
718 epatch 851 epatch
719 852
720 # last -fPIC fixup, per bug #305873 853 # last -fPIC fixup, per bug #305873
721 i="${S}"/storage/innodb_plugin/plug.in 854 i="${S}"/storage/innodb_plugin/plug.in
722 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 855 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
723 856
724 # Additional checks, remove bundled zlib 857 # Additional checks, remove bundled zlib (Cluster needs this, for static
858 # memory management in zlib, leave available for Cluster)
859 if [[ "${PN}" != "mysql-cluster" ]] ; then
725 rm -f "${S}/zlib/"*.[ch] 860 rm -f "${S}/zlib/"*.[ch]
726 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 861 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
862 fi
727 rm -f "scripts/mysqlbug" 863 rm -f "scripts/mysqlbug"
728 864
729 # Make charsets install in the right place 865 # Make charsets install in the right place
730 find . -name 'Makefile.am' \ 866 find . -name 'Makefile.am' \
731 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 867 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
742 fi 878 fi
743 879
744 local rebuilddirlist d 880 local rebuilddirlist d
745 881
746 if xtradb_patch_available && use xtradb ; then 882 if xtradb_patch_available && use xtradb ; then
747 einfo "Replacing InnoDB with Percona XtraDB" 883 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
748 pushd "${S}"/storage 884 pushd "${S}"/storage >/dev/null
749 i="innobase" 885 i="innobase"
750 o="${WORKDIR}/storage-${i}.mysql-upstream" 886 o="${WORKDIR}/storage-${i}.mysql-upstream"
751 # Have we been here already? 887 # Have we been here already?
752 [ -d "${o}" ] && rm -f "${i}" 888 [ -d "${o}" ] && rm -f "${i}"
753 # Or maybe we haven't 889 # Or maybe we haven't
754 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 890 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
755 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 891 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
756 popd 892 popd >/dev/null
893 fi
894
895 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
896 einfo "Adding storage engine: PBXT"
897 pushd "${S}"/storage >/dev/null
898 i='pbxt'
899 [ -d "${i}" ] && rm -rf "${i}"
900 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
901 popd >/dev/null
757 fi 902 fi
758 903
759 if mysql_version_is_at_least "5.1.12" ; then 904 if mysql_version_is_at_least "5.1.12" ; then
760 rebuilddirlist="." 905 rebuilddirlist="."
761 # This does not seem to be needed presently. robbat2 2010/02/23 906 # This does not seem to be needed presently. robbat2 2010/02/23
770 fi 915 fi
771 916
772 for d in ${rebuilddirlist} ; do 917 for d in ${rebuilddirlist} ; do
773 einfo "Reconfiguring dir '${d}'" 918 einfo "Reconfiguring dir '${d}'"
774 pushd "${d}" &>/dev/null 919 pushd "${d}" &>/dev/null
775 AT_GNUCONF_UPDATE="yes" eautoreconf 920 eautoreconf
776 popd &>/dev/null 921 popd &>/dev/null
777 done 922 done
778 923
779 if mysql_check_version_range "4.1 to 5.0.99.99" \ 924 if mysql_check_version_range "4.1 to 5.0.99.99" \
780 && use berkdb ; then 925 && use berkdb ; then
835 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 980 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
836 export CXXFLAGS 981 export CXXFLAGS
837 982
838 # bug #283926, with GCC4.4, this is required to get correct behavior. 983 # bug #283926, with GCC4.4, this is required to get correct behavior.
839 append-flags -fno-strict-aliasing 984 append-flags -fno-strict-aliasing
985
986 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
987 # causes a mis-compile.
988 # Upstream bugs:
989 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
990 # http://bugs.mysql.com/bug.php?id=45205
991 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
992 append-flags -fno-omit-frame-pointer && \
993 filter-flags -fomit-frame-pointer
840 994
841 econf \ 995 econf \
842 --libexecdir="/usr/sbin" \ 996 --libexecdir="/usr/sbin" \
843 --sysconfdir="${MY_SYSCONFDIR}" \ 997 --sysconfdir="${MY_SYSCONFDIR}" \
844 --localstatedir="${MY_LOCALSTATEDIR}" \ 998 --localstatedir="${MY_LOCALSTATEDIR}" \
855 # TODO: Move this before autoreconf !!! 1009 # TODO: Move this before autoreconf !!!
856 find . -type f -name Makefile -print0 \ 1010 find . -type f -name Makefile -print0 \
857 | xargs -0 -n100 sed -i \ 1011 | xargs -0 -n100 sed -i \
858 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1012 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
859 1013
860 if [[ $EAPI == 2 ]]; then 1014 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
861 pbxt_patch_available && use pbxt && pbxt_src_configure 1015 pbxt_patch_available && use pbxt && pbxt_src_configure
862 fi 1016 fi
863} 1017}
864 1018
865# @FUNCTION: mysql_src_compile 1019# @FUNCTION: mysql_src_compile
872 0 | 1) mysql_src_configure ;; 1026 0 | 1) mysql_src_configure ;;
873 esac 1027 esac
874 1028
875 emake || die "emake failed" 1029 emake || die "emake failed"
876 1030
1031 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
877 pbxt_patch_available && use pbxt && pbxt_src_compile 1032 pbxt_patch_available && use pbxt && pbxt_src_compile
1033 fi
878} 1034}
879 1035
880# @FUNCTION: mysql_src_install 1036# @FUNCTION: mysql_src_install
881# @DESCRIPTION: 1037# @DESCRIPTION:
882# Install mysql. 1038# Install mysql.
888 DESTDIR="${D}" \ 1044 DESTDIR="${D}" \
889 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1045 benchdir_root="${MY_SHAREDSTATEDIR}" \
890 testroot="${MY_SHAREDSTATEDIR}" \ 1046 testroot="${MY_SHAREDSTATEDIR}" \
891 || die "emake install failed" 1047 || die "emake install failed"
892 1048
1049 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
893 pbxt_patch_available && use pbxt && pbxt_src_install 1050 pbxt_patch_available && use pbxt && pbxt_src_install
1051 fi
894 1052
895 # Convenience links 1053 # Convenience links
896 einfo "Making Convenience links for mysqlcheck multi-call binary" 1054 einfo "Making Convenience links for mysqlcheck multi-call binary"
897 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1055 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
898 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1056 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
922 if use !test ; then 1080 if use !test ; then
923 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1081 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
924 fi 1082 fi
925 1083
926 # Configuration stuff 1084 # Configuration stuff
927 if mysql_version_is_at_least "4.1" ; then 1085 case ${MYSQL_PV_MAJOR} in
928 mysql_mycnf_version="4.1"
929 else
930 mysql_mycnf_version="4.0" 1086 3*|4.0) mysql_mycnf_version="4.0" ;;
931 fi 1087 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
932 einfo "Building default my.cnf" 1088 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1089 esac
1090 einfo "Building default my.cnf (${mysql_mycnf_version})"
933 insinto "${MY_SYSCONFDIR}" 1091 insinto "${MY_SYSCONFDIR}"
934 doins scripts/mysqlaccess.conf 1092 doins scripts/mysqlaccess.conf
1093 mycnf_src="my.cnf-${mysql_mycnf_version}"
935 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1094 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
936 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1095 "${FILESDIR}/${mycnf_src}" \
937 > "${TMPDIR}/my.cnf.ok" 1096 > "${TMPDIR}/my.cnf.ok"
938 if mysql_version_is_at_least "4.1" && use latin1 ; then 1097 if use latin1 ; then
939 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 1098 sed -i \
1099 -e "/character-set/s|utf8|latin1|g" \
1100 "${TMPDIR}/my.cnf.ok"
940 fi 1101 fi
941 newins "${TMPDIR}/my.cnf.ok" my.cnf 1102 newins "${TMPDIR}/my.cnf.ok" my.cnf
942 1103
943 # Minimal builds don't have the MySQL server 1104 # Minimal builds don't have the MySQL server
944 if ! use minimal ; then 1105 if ! use minimal ; then
1035 1196
1036 einfo 1197 einfo
1037 elog "You might want to run:" 1198 elog "You might want to run:"
1038 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1199 elog "\"emerge --config =${CATEGORY}/${PF}\""
1039 elog "if this is a new install." 1200 elog "if this is a new install."
1201 einfo
1202
1203 einfo
1204 elog "If you are upgrading major versions, you should run the"
1205 elog "mysql_upgrade tool."
1040 einfo 1206 einfo
1041 fi 1207 fi
1042 1208
1043 if pbxt_available && use pbxt ; then 1209 if pbxt_available && use pbxt ; then
1044 # TODO: explain it better 1210 # TODO: explain it better
1099 fi 1265 fi
1100 fi 1266 fi
1101 1267
1102 local pwd1="a" 1268 local pwd1="a"
1103 local pwd2="b" 1269 local pwd2="b"
1270 local MYSQL_ROOT_PASSWORD=''
1104 local maxtry=5 1271 local maxtry=15
1272
1273 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1274 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1275 fi
1105 1276
1106 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1277 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1107 ewarn "You have already a MySQL database in place." 1278 ewarn "You have already a MySQL database in place."
1108 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1279 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1109 ewarn "Please rename or delete it if you wish to replace it." 1280 ewarn "Please rename or delete it if you wish to replace it."
1112 1283
1113 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1284 # Bug #213475 - MySQL _will_ object strenously if your machine is named
1114 # localhost. Also causes weird failures. 1285 # localhost. Also causes weird failures.
1115 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1286 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1116 1287
1117 einfo "Creating the mysql database and setting proper" 1288 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1118 einfo "permissions on it ..."
1119 1289
1120 einfo "Insert a password for the mysql 'root' user" 1290 einfo "Please provide a password for the mysql 'root' user now,"
1291 einfo "or in the MYSQL_ROOT_PASSWORD env var."
1121 ewarn "Avoid [\"'\\_%] characters in the password" 1292 ewarn "Avoid [\"'\\_%] characters in the password"
1122 read -rsp " >" pwd1 ; echo 1293 read -rsp " >" pwd1 ; echo
1123 1294
1124 einfo "Retype the password" 1295 einfo "Retype the password"
1125 read -rsp " >" pwd2 ; echo 1296 read -rsp " >" pwd2 ; echo
1126 1297
1127 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1298 if [[ "x$pwd1" != "x$pwd2" ]] ; then
1128 die "Passwords are not the same" 1299 die "Passwords are not the same"
1300 fi
1301 MYSQL_ROOT_PASSWORD="${pwd1}"
1302 unset pwd1 pwd2
1129 fi 1303 fi
1130 1304
1131 local options="" 1305 local options=""
1132 local sqltmp="$(emktemp)" 1306 local sqltmp="$(emktemp)"
1133 1307
1147 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1321 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1148 || die "MySQL databases not installed" 1322 || die "MySQL databases not installed"
1149 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1323 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1150 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1324 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1151 1325
1326 # Figure out which options we need to disable to do the setup
1327 helpfile="${TMPDIR}/mysqld-help"
1328 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1329 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1330 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1331 ndbcluster \
1332 ; do
1333 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1334 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1335 done
1336 # But some options changed names
1337 egrep -sq external-locking "${helpfile}" && \
1338 options="${options/skip-locking/skip-external-locking}"
1339
1152 if mysql_version_is_at_least "4.1.3" ; then 1340 if mysql_version_is_at_least "4.1.3" ; then
1153 options="--skip-ndbcluster"
1154
1155 # Filling timezones, see 1341 # Filling timezones, see
1156 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1342 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1157 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1343 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1158 1344
1159 if [[ -r "${help_tables}" ]] ; then 1345 if [[ -r "${help_tables}" ]] ; then
1160 cat "${help_tables}" >> "${sqltmp}" 1346 cat "${help_tables}" >> "${sqltmp}"
1161 fi 1347 fi
1162 fi 1348 fi
1349
1350 einfo "Creating the mysql database and setting proper"
1351 einfo "permissions on it ..."
1163 1352
1164 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1353 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1165 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1354 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1166 local mysqld="${ROOT}/usr/sbin/mysqld \ 1355 local mysqld="${ROOT}/usr/sbin/mysqld \
1167 ${options} \ 1356 ${options} \
1168 --user=mysql \ 1357 --user=mysql \
1169 --skip-grant-tables \
1170 --basedir=${ROOT}/usr \ 1358 --basedir=${ROOT}/usr \
1171 --datadir=${ROOT}/${MY_DATADIR} \ 1359 --datadir=${ROOT}/${MY_DATADIR} \
1172 --skip-innodb \
1173 --skip-bdb \
1174 --skip-networking \
1175 --max_allowed_packet=8M \ 1360 --max_allowed_packet=8M \
1176 --net_buffer_length=16K \ 1361 --net_buffer_length=16K \
1362 --default-storage-engine=MyISAM \
1177 --socket=${socket} \ 1363 --socket=${socket} \
1178 --pid-file=${pidfile}" 1364 --pid-file=${pidfile}"
1365 #einfo "About to start mysqld: ${mysqld}"
1366 ebegin "Starting mysqld"
1179 ${mysqld} & 1367 ${mysqld} &
1368 rc=$?
1180 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1369 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1181 maxtry=$((${maxtry}-1)) 1370 maxtry=$((${maxtry}-1))
1182 echo -n "." 1371 echo -n "."
1183 sleep 1 1372 sleep 1
1184 done 1373 done
1374 eend $rc
1185 1375
1376 if ! [[ -S "${socket}" ]]; then
1377 die "Completely failed to start up mysqld with: ${mysqld}"
1378 fi
1379
1380 ebegin "Setting root password"
1186 # Do this from memory, as we don't want clear text passwords in temp files 1381 # Do this from memory, as we don't want clear text passwords in temp files
1187 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1382 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1188 "${ROOT}/usr/bin/mysql" \ 1383 "${ROOT}/usr/bin/mysql" \
1189 --socket=${socket} \ 1384 --socket=${socket} \
1190 -hlocalhost \ 1385 -hlocalhost \
1191 -e "${sql}" 1386 -e "${sql}"
1387 eend $?
1192 1388
1193 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1389 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1194
1195 "${ROOT}/usr/bin/mysql" \ 1390 "${ROOT}/usr/bin/mysql" \
1196 --socket=${socket} \ 1391 --socket=${socket} \
1197 -hlocalhost \ 1392 -hlocalhost \
1198 -uroot \ 1393 -uroot \
1199 -p"${pwd1}" \ 1394 -p"${MYSQL_ROOT_PASSWORD}" \
1200 mysql < "${sqltmp}" 1395 mysql < "${sqltmp}"
1396 rc=$?
1397 eend $?
1398 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1201 1399
1202 # Stop the server and cleanup 1400 # Stop the server and cleanup
1401 einfo "Stopping the server ..."
1203 kill $(< "${pidfile}" ) 1402 kill $(< "${pidfile}" )
1204 rm -f "${sqltmp}" 1403 rm -f "${sqltmp}"
1205 einfo "Stopping the server ..."
1206 wait %1 1404 wait %1
1207 einfo "Done" 1405 einfo "Done"
1208} 1406}
1209 1407
1210# @FUNCTION: mysql_pkg_postrm 1408# @FUNCTION: mysql_pkg_postrm

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.155

  ViewVC Help
Powered by ViewVC 1.1.20