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

Diff of /eclass/mysql.eclass

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

Revision 1.127 Revision 1.144
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.127 2010/02/01 01:07:08 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.144 2010/04/01 20:36:39 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>
51 ;; 51 ;;
52 *) 52 *)
53 die "Unsupported EAPI: ${EAPI}" ;; 53 die "Unsupported EAPI: ${EAPI}" ;;
54esac 54esac
55 55
56
57# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
58# @DESCRIPTION:
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
61# mysql_upgrade.
62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
63
56# @ECLASS-VARIABLE: MYSQL_VERSION_ID 64# @ECLASS-VARIABLE: MYSQL_VERSION_ID
57# @DESCRIPTION: 65# @DESCRIPTION:
58# MYSQL_VERSION_ID will be: 66# MYSQL_VERSION_ID will be:
59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 67# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
60# This is an important part, because many of the choices the MySQL ebuild will do 68# This is an important part, because many of the choices the MySQL ebuild will do
77# @DESCRIPTION: 85# @DESCRIPTION:
78# Specifiy if community features are available. Possible values are 1 (yes) 86# Specifiy if community features are available. Possible values are 1 (yes)
79# and 0 (no). 87# and 0 (no).
80# Community features are available in mysql-community 88# Community features are available in mysql-community
81# AND in the re-merged mysql-5.0.82 and newer 89# AND in the re-merged mysql-5.0.82 and newer
82if [ "${PN}" == "mysql-community" ]; then 90if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
83 MYSQL_COMMUNITY_FEATURES=1 91 MYSQL_COMMUNITY_FEATURES=1
84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then 92elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
85 MYSQL_COMMUNITY_FEATURES=1 93 MYSQL_COMMUNITY_FEATURES=1
86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then 94elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
87 MYSQL_COMMUNITY_FEATURES=1 95 MYSQL_COMMUNITY_FEATURES=1
88elif [ "${PV#5.4}" != "${PV}" ]; then 96elif [ "${PV#5.4}" != "${PV}" ] ; then
97 MYSQL_COMMUNITY_FEATURES=1
98elif [ "${PV#5.5}" != "${PV}" ] ; then
99 MYSQL_COMMUNITY_FEATURES=1
100elif [ "${PV#6.0}" != "${PV}" ] ; then
89 MYSQL_COMMUNITY_FEATURES=1 101 MYSQL_COMMUNITY_FEATURES=1
90else 102else
91 MYSQL_COMMUNITY_FEATURES=0 103 MYSQL_COMMUNITY_FEATURES=0
92fi 104fi
93 105
108 >=sys-apps/sed-4 120 >=sys-apps/sed-4
109 >=sys-apps/texinfo-4.7-r1 121 >=sys-apps/texinfo-4.7-r1
110 >=sys-libs/readline-4.1 122 >=sys-libs/readline-4.1
111 >=sys-libs/zlib-1.2.3" 123 >=sys-libs/zlib-1.2.3"
112 124
125[[ "${PN}" == "mariadb" ]] \
126&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
127
113# Having different flavours at the same time is not a good idea 128# Having different flavours at the same time is not a good idea
114for i in "" "-community" ; do 129for i in "mysql" "mysql-community" "mariadb" ; do
115 [[ "${i}" == ${PN#mysql} ]] || 130 [[ "${i}" == ${PN} ]] ||
116 DEPEND="${DEPEND} !dev-db/mysql${i}" 131 DEPEND="${DEPEND} !dev-db/${i}"
117done 132done
118 133
119RDEPEND="${DEPEND} 134RDEPEND="${DEPEND}
120 !minimal? ( dev-db/mysql-init-scripts ) 135 !minimal? ( dev-db/mysql-init-scripts )
121 selinux? ( sec-policy/selinux-mysql )" 136 selinux? ( sec-policy/selinux-mysql )"
130 145
131# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 146# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
132PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 147PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
133 148
134# For other stuff to bring us in 149# For other stuff to bring us in
135PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})" 150PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
136 151
137# Work out the default SERVER_URI correctly 152# Work out the default SERVER_URI correctly
138if [ -z "${SERVER_URI}" ]; then 153if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
157 SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz"
139 # The community build is on the mirrors 158 # The community build is on the mirrors
140 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
141 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
142 # The (old) enterprise source is on the primary site only 161 # The (old) enterprise source is on the primary site only
143 elif [ "${PN}" == "mysql" ]; then 162 elif [ "${PN}" == "mysql" ]; then
144 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 163 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
145 fi 164 fi
146fi 165fi
147 166
148# Define correct SRC_URIs 167# Define correct SRC_URIs
149SRC_URI="${SERVER_URI}" 168SRC_URI="${SERVER_URI}"
153&& SRC_URI="${SRC_URI} 172&& SRC_URI="${SRC_URI}
154 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 173 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
155 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 174 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
156 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 175 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
157 176
158# PBXT engine
159mysql_version_is_at_least "5.1.12" \
160&& [[ -n "${PBXT_VERSION}" ]] \
161&& PBXT_P="pbxt-${PBXT_VERSION}" \
162&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
163&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
164
165# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
166mysql_version_is_at_least "5.1.26" \
167&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
168&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
169&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
170&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
171
172DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 177DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
173HOMEPAGE="http://www.mysql.com/" 178HOMEPAGE="http://www.mysql.com/"
179if [[ "${PN}" == "mariadb" ]]; then
180 HOMEPAGE="http://askmonty.org/"
181 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
182fi
183if [[ "${PN}" == "mysql-community" ]]; then
184 DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
185fi
174LICENSE="GPL-2" 186LICENSE="GPL-2"
175SLOT="0" 187SLOT="0"
176IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static" 188IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
177 189
178mysql_version_is_at_least "4.1" \ 190mysql_version_is_at_least "4.1" \
179&& IUSE="${IUSE} latin1" 191&& IUSE="${IUSE} latin1"
180 192
181mysql_version_is_at_least "4.1.3" \ 193mysql_version_is_at_least "4.1.3" \
188&& IUSE="${IUSE} max-idx-128" 200&& IUSE="${IUSE} max-idx-128"
189 201
190mysql_version_is_at_least "5.1" \ 202mysql_version_is_at_least "5.1" \
191|| IUSE="${IUSE} berkdb" 203|| IUSE="${IUSE} berkdb"
192 204
193mysql_version_is_at_least "5.1.12" \
194&& [[ -n "${PBXT_VERSION}" ]] \
195&& IUSE="${IUSE} pbxt"
196
197mysql_version_is_at_least "5.1.26" \
198&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
199&& IUSE="${IUSE} xtradb"
200
201[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 205[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
202&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 206&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
207
208[[ "${PN}" == "mariadb" ]] \
209&& IUSE="${IUSE} libevent"
210
211# MariaDB has integrated PBXT
212# PBXT_VERSION means that we have a PBXT patch for this PV
213# PBXT was only introduced after 5.1.12
214pbxt_patch_available() {
215 [[ "${PN}" != "mariadb" ]] \
216 && mysql_version_is_at_least "5.1.12" \
217 && [[ -n "${PBXT_VERSION}" ]]
218 return $?
219}
220
221pbxt_available() {
222 pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
223 return $?
224}
225
226# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
227# MariaDB has integrated XtraDB
228# XTRADB_VERS means that we have a XTRADB patch for this PV
229# XTRADB was only introduced after 5.1.26
230xtradb_patch_available() {
231 [[ "${PN}" != "mariadb" ]] \
232 && mysql_version_is_at_least "5.1.26" \
233 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
234 return $?
235}
236
237pbxt_patch_available \
238&& PBXT_P="pbxt-${PBXT_VERSION}" \
239&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
240&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
241
242pbxt_available \
243&& IUSE="${IUSE} pbxt"
244
245xtradb_patch_available \
246&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
247&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
248&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
249&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
250&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \
251&& IUSE="${IUSE} xtradb"
203 252
204# 253#
205# HELPER FUNCTIONS: 254# HELPER FUNCTIONS:
206# 255#
207 256
215 ewarn "test '${rawtestname}' disabled: '${reason}'" 264 ewarn "test '${rawtestname}' disabled: '${reason}'"
216 265
217 testsuite="${rawtestname/.*}" 266 testsuite="${rawtestname/.*}"
218 testname="${rawtestname/*.}" 267 testname="${rawtestname/*.}"
219 mysql_disable_file="${S}/mysql-test/t/disabled.def" 268 mysql_disable_file="${S}/mysql-test/t/disabled.def"
220 einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 269 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
221 echo ${testname} : ${reason} >> "${mysql_disable_file}" 270 echo ${testname} : ${reason} >> "${mysql_disable_file}"
222 271
223 # ${S}/mysql-tests/t/disabled.def 272 # ${S}/mysql-tests/t/disabled.def
224 # 273 #
225 # ${S}/mysql-tests/suite/federated/disabled.def 274 # ${S}/mysql-tests/suite/federated/disabled.def
395 myconf="${myconf} $(use_with perl bench)" 444 myconf="${myconf} $(use_with perl bench)"
396 myconf="${myconf} --enable-assembler" 445 myconf="${myconf} --enable-assembler"
397 myconf="${myconf} --with-extra-tools" 446 myconf="${myconf} --with-extra-tools"
398 myconf="${myconf} --with-innodb" 447 myconf="${myconf} --with-innodb"
399 myconf="${myconf} --without-readline" 448 myconf="${myconf} --without-readline"
449 myconf="${myconf} $(use_with ssl openssl)"
400 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 450 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
401 451
402 # --with-vio is not needed anymore, it's on by default and 452 # --with-vio is not needed anymore, it's on by default and
403 # has been removed from configure 453 # has been removed from configure
454 # Apply to 4.x and 5.0.[0-3]
404 if use ssl ; then 455 if use ssl ; then
405 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 456 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
406 fi
407
408 if mysql_version_is_at_least "5.1.11" ; then
409 myconf="${myconf} $(use_with ssl)"
410 else
411 myconf="${myconf} $(use_with ssl openssl)"
412 fi 457 fi
413 458
414 if mysql_version_is_at_least "5.0.60" ; then 459 if mysql_version_is_at_least "5.0.60" ; then
415 if use berkdb ; then 460 if use berkdb ; then
416 elog "Berkeley DB support was disabled due to build failures" 461 elog "Berkeley DB support was disabled due to build failures"
473 518
474configure_51() { 519configure_51() {
475 # TODO: !!!! readd --without-readline 520 # TODO: !!!! readd --without-readline
476 # the failure depend upon config/ac-macros/readline.m4 checking into 521 # the failure depend upon config/ac-macros/readline.m4 checking into
477 # readline.h instead of history.h 522 # readline.h instead of history.h
478 myconf="${myconf} $(use_with ssl)" 523 myconf="${myconf} $(use_with ssl ssl /usr)"
479 myconf="${myconf} --enable-assembler" 524 myconf="${myconf} --enable-assembler"
480 myconf="${myconf} --with-geometry" 525 myconf="${myconf} --with-geometry"
481 myconf="${myconf} --with-readline" 526 myconf="${myconf} --with-readline"
482 myconf="${myconf} --with-row-based-replication"
483 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 527 myconf="${myconf} --with-zlib-dir=/usr/"
484 myconf="${myconf} --without-pstack" 528 myconf="${myconf} --without-pstack"
485 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 529 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
530 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
531 myconf="${myconf} $(use_enable community community-features)"
532 if use community; then
533 myconf="${myconf} $(use_enable profiling)"
534 else
535 myconf="${myconf} --disable-profiling"
536 fi
537 fi
486 538
487 # 5.1 introduces a new way to manage storage engines (plugins) 539 # 5.1 introduces a new way to manage storage engines (plugins)
488 # like configuration=none 540 # like configuration=none
541 # This base set are required, and will always be statically built.
489 local plugins="csv,myisam,myisammrg,heap" 542 local plugins="csv,myisam,myisammrg,heap"
490 if use extraengine ; then 543 if use extraengine ; then
491 # like configuration=max-no-ndb, archive and example removed in 5.1.11 544 # like configuration=max-no-ndb, archive and example removed in 5.1.11
545 # not added yet: ibmdb2i
546 # Not supporting as examples: example,daemon_example,ftexample
492 plugins="${plugins},archive,blackhole,example,federated,partition" 547 plugins="${plugins},archive,blackhole,federated,partition"
493 548
549 if [[ "${PN}" != "mariadb" ]] ; then
494 elog "Before using the Federated storage engine, please be sure to read" 550 elog "Before using the Federated storage engine, please be sure to read"
495 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 551 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
552 else
553 elog "MariaDB includes the FederatedX engine. Be sure to read"
554 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
496 fi 555 fi
556 fi
497 557
498 # Upstream specifically requests that InnoDB always be built. 558 # Upstream specifically requests that InnoDB always be built:
499 plugins="${plugins},innobase" 559 # - innobase, innodb_plugin
560 # Build falcon if available for 6.x series.
561 for i in innobase innodb_plugin falcon ; do
562 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}"
563 done
500 564
501 # like configuration=max-no-ndb 565 # like configuration=max-no-ndb
502 if use cluster ; then 566 if use cluster ; then
503 plugins="${plugins},ndbcluster" 567 plugins="${plugins},ndbcluster"
504 myconf="${myconf} --with-ndb-binlog" 568 myconf="${myconf} --with-ndb-binlog"
505 fi 569 fi
506 570
507 if mysql_version_is_at_least "5.2" ; then 571 if [[ "${PN}" == "mariadb" ]] ; then
572 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
573 # caught above.
574 plugins="${plugins},maria,innobase"
575 if use pbxt ; then
508 plugins="${plugins},falcon" 576 plugins="${plugins},pbxt"
577 else
578 myconf="${myconf} --without-plugin-pbxt"
579 fi
580 myconf="${myconf} $(use_with libevent)"
581 # This is not optional, without it several upstream testcases fail.
582 # Also strongly recommended by upstream.
583 myconf="${myconf} --with-maria-tmp-tables"
509 fi 584 fi
510 585
511 myconf="${myconf} --with-plugins=${plugins}" 586 myconf="${myconf} --with-plugins=${plugins}"
512} 587}
513 588
518 593
519 einfo "Reconfiguring dir '${PWD}'" 594 einfo "Reconfiguring dir '${PWD}'"
520 AT_GNUCONF_UPDATE="yes" eautoreconf 595 AT_GNUCONF_UPDATE="yes" eautoreconf
521 596
522 local myconf="" 597 local myconf=""
523 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 598 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
524 use debug && myconf="${myconf} --with-debug=full" 599 use debug && myconf="${myconf} --with-debug=full"
525 # TODO: is it safe/needed to use econf here ?
526 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 600 econf ${myconf} || die "Problem configuring PBXT storage engine"
527} 601}
528 602
529pbxt_src_compile() { 603pbxt_src_compile() {
530 # Be backwards compatible for now 604 # Be backwards compatible for now
531 if [[ $EAPI != 2 ]]; then 605 if [[ $EAPI != 2 ]]; then
538 # TODO: modify test suite for PBXT 612 # TODO: modify test suite for PBXT
539} 613}
540 614
541pbxt_src_install() { 615pbxt_src_install() {
542 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 616 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
543 make install || die "Failed to install PBXT" 617 emake install DESTDIR="${D}" || die "Failed to install PBXT"
544 popd 618 popd
545} 619}
546 620
547# 621#
548# EBUILD FUNCTIONS 622# EBUILD FUNCTIONS
582 && use minimal ; then 656 && use minimal ; then
583 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 657 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
584 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 658 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
585 fi 659 fi
586 660
661 # Bug #290570, 284946, 307251
587 # Bug #290570 fun. Upstream made us need a fairly new GCC4. 662 # Upstream changes made us need a fairly new GCC4.
588 if mysql_version_is_at_least "5.0.83" ; then 663 # But only for 5.0.8[3-6]!
664 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
589 GCC_VER=$(gcc-version) 665 GCC_VER=$(gcc-version)
590 case ${GCC_VER} in 666 case ${GCC_VER} in
591 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 667 2*|3*|4.0|4.1|4.2)
668 eerror "Some releases of MySQL required a very new GCC, and then"
669 eerror "later release relaxed that requirement again. Either pick a"
670 eerror "MySQL >=5.0.87, or use a newer GCC."
671 die "Active GCC too old!" ;;
592 esac 672 esac
593 fi 673 fi
594 674
595 # This should come after all of the die statements 675 # This should come after all of the die statements
596 enewgroup mysql 60 || die "problem adding 'mysql' group" 676 enewgroup mysql 60 || die "problem adding 'mysql' group"
597 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 677 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
598 678
599 mysql_check_version_range "4.0 to 5.0.99.99" \ 679 mysql_check_version_range "4.0 to 5.0.99.99" \
600 && use berkdb \ 680 && use berkdb \
601 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 681 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
682
683 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
684 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
685 ewarn "5.1 series should NOT be put into production. In the near"
686 ewarn "future, it will be disabled from building."
687 ewarn ""
688 ewarn "If you need NDB support, you should instead move to the new"
689 ewarn "mysql-cluster package that represents that upstream NDB"
690 ewarn "development."
691 fi
602} 692}
603 693
604# @FUNCTION: mysql_src_unpack 694# @FUNCTION: mysql_src_unpack
605# @DESCRIPTION: 695# @DESCRIPTION:
606# Unpack the source code and call mysql_src_prepare for EAPI < 2. 696# Unpack the source code and call mysql_src_prepare for EAPI < 2.
635 # Now link in right patches 725 # Now link in right patches
636 mysql_mv_patches 726 mysql_mv_patches
637 # And apply 727 # And apply
638 epatch 728 epatch
639 729
730 # last -fPIC fixup, per bug #305873
731 i="${S}"/storage/innodb_plugin/plug.in
732 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
733
640 # Additional checks, remove bundled zlib 734 # Additional checks, remove bundled zlib
641 rm -f "${S}/zlib/"*.[ch] 735 rm -f "${S}/zlib/"*.[ch]
642 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 736 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
643 rm -f "scripts/mysqlbug" 737 rm -f "scripts/mysqlbug"
644 738
657 rm -f "scripts/mysqlbug" 751 rm -f "scripts/mysqlbug"
658 fi 752 fi
659 753
660 local rebuilddirlist d 754 local rebuilddirlist d
661 755
662 if mysql_version_is_at_least "5.1.26" && use xtradb ; then 756 if xtradb_patch_available && use xtradb ; then
663 einfo "Replacing InnoDB with Percona XtraDB" 757 einfo "Replacing InnoDB with Percona XtraDB"
664 pushd "${S}"/storage 758 pushd "${S}"/storage
665 i="innobase" 759 i="innobase"
666 o="${WORKDIR}/storage-${i}.mysql-upstream" 760 o="${WORKDIR}/storage-${i}.mysql-upstream"
667 # Have we been here already? 761 # Have we been here already?
668 [ -h "${i}" ] && rm -f "${i}" 762 [ -d "${o}" ] && rm -f "${i}"
669 # Or maybe we haven't 763 # Or maybe we haven't
670 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 764 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
671 ln -s "${WORKDIR}/${XTRADB_P}" "${i}" 765 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
672 popd 766 popd
673 fi 767 fi
674 768
675 if mysql_version_is_at_least "5.1.12" ; then 769 if mysql_version_is_at_least "5.1.12" ; then
676 einfo "Updating innobase cmake"
677 rebuilddirlist="." 770 rebuilddirlist="."
771 # This does not seem to be needed presently. robbat2 2010/02/23
772 #einfo "Updating innobase cmake"
678 # TODO: check this with a cmake expert 773 ## TODO: check this with a cmake expert
679 cmake \ 774 #cmake \
680 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 775 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
681 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 776 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
682 "storage/innobase" 777 # "storage/innobase"
683 else 778 else
684 rebuilddirlist=". innobase" 779 rebuilddirlist=". innobase"
685 fi 780 fi
686 781
687 for d in ${rebuilddirlist} ; do 782 for d in ${rebuilddirlist} ; do
771 find . -type f -name Makefile -print0 \ 866 find . -type f -name Makefile -print0 \
772 | xargs -0 -n100 sed -i \ 867 | xargs -0 -n100 sed -i \
773 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 868 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
774 869
775 if [[ $EAPI == 2 ]]; then 870 if [[ $EAPI == 2 ]]; then
776 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 871 pbxt_patch_available && use pbxt && pbxt_src_configure
777 fi 872 fi
778} 873}
779 874
780# @FUNCTION: mysql_src_compile 875# @FUNCTION: mysql_src_compile
781# @DESCRIPTION: 876# @DESCRIPTION:
782# Compile the mysql code. 877# Compile the mysql code.
783mysql_src_compile() { 878mysql_src_compile() {
784 # Be backwards compatible for now 879 # Be backwards compatible for now
785 case ${EAPI:-0} in 880 case ${EAPI:-0} in
786 2) : ;; 881 2) : ;;
787 0 | 1) mysql_src_configure ;; 882 0 | 1) mysql_src_configure ;;
788 esac 883 esac
789 884
790 emake || die "emake failed" 885 emake || die "emake failed"
791 886
792 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 887 pbxt_patch_available && use pbxt && pbxt_src_compile
793} 888}
794 889
795# @FUNCTION: mysql_src_install 890# @FUNCTION: mysql_src_install
796# @DESCRIPTION: 891# @DESCRIPTION:
797# Install mysql. 892# Install mysql.
798mysql_src_install() { 893mysql_src_install() {
799 # Make sure the vars are correctly initialized 894 # Make sure the vars are correctly initialized
800 mysql_init_vars 895 mysql_init_vars
801 896
802 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 897 emake install \
898 DESTDIR="${D}" \
899 benchdir_root="${MY_SHAREDSTATEDIR}" \
900 testroot="${MY_SHAREDSTATEDIR}" \
901 || die "emake install failed"
803 902
804 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 903 pbxt_patch_available && use pbxt && pbxt_src_install
805 904
806 # Convenience links 905 # Convenience links
807 einfo "Making Convenience links for mysqlcheck multi-call binary" 906 einfo "Making Convenience links for mysqlcheck multi-call binary"
808 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 907 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
809 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 908 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
813 einfo "Removing duplicate /usr/share/mysql files" 912 einfo "Removing duplicate /usr/share/mysql files"
814 rm -Rf "${D}/usr/share/info" 913 rm -Rf "${D}/usr/share/info"
815 for removeme in "mysql-log-rotate" mysql.server* \ 914 for removeme in "mysql-log-rotate" mysql.server* \
816 binary-configure* my-*.cnf mi_test_all* 915 binary-configure* my-*.cnf mi_test_all*
817 do 916 do
818 rm -f "${D}"/usr/share/mysql/${removeme} 917 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
819 done 918 done
820 919
821 # Clean up stuff for a minimal build 920 # Clean up stuff for a minimal build
822 if use minimal ; then 921 if use minimal ; then
823 einfo "Remove all extra content for minimal build" 922 einfo "Remove all extra content for minimal build"
825 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} 924 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}
826 rm -f "${D}/usr/sbin/mysqld" 925 rm -f "${D}/usr/sbin/mysqld"
827 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 926 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
828 fi 927 fi
829 928
929 # Unless they explicitly specific USE=test, then do not install the
930 # testsuite. It DOES have a use to be installed, esp. when you want to do a
931 # validation of your database configuration after tuning it.
932 if use !test ; then
933 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
934 fi
935
830 # Configuration stuff 936 # Configuration stuff
937 if mysql_version_is_at_least "5.1" ; then
938 mysql_mycnf_version="5.1"
831 if mysql_version_is_at_least "4.1" ; then 939 elif mysql_version_is_at_least "4.1" ; then
832 mysql_mycnf_version="4.1" 940 mysql_mycnf_version="4.1"
833 else 941 else
834 mysql_mycnf_version="4.0" 942 mysql_mycnf_version="4.0"
835 fi 943 fi
836 einfo "Building default my.cnf" 944 einfo "Building default my.cnf"
838 doins scripts/mysqlaccess.conf 946 doins scripts/mysqlaccess.conf
839 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 947 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
840 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 948 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
841 > "${TMPDIR}/my.cnf.ok" 949 > "${TMPDIR}/my.cnf.ok"
842 if mysql_version_is_at_least "4.1" && use latin1 ; then 950 if mysql_version_is_at_least "4.1" && use latin1 ; then
843 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 951 sed -i \
952 -e "/character-set/s|utf8|latin1|g" \
953 "${TMPDIR}/my.cnf.ok"
844 fi 954 fi
845 newins "${TMPDIR}/my.cnf.ok" my.cnf 955 newins "${TMPDIR}/my.cnf.ok" my.cnf
846 956
847 # Minimal builds don't have the MySQL server 957 # Minimal builds don't have the MySQL server
848 if ! use minimal ; then 958 if ! use minimal ; then
863 done 973 done
864 fi 974 fi
865 975
866 # Docs 976 # Docs
867 einfo "Installing docs" 977 einfo "Installing docs"
868 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 978 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
869 doinfo "${S}"/Docs/mysql.info 979 doinfo "${S}"/Docs/mysql.info
870 980
871 # Minimal builds don't have the MySQL server 981 # Minimal builds don't have the MySQL server
872 if ! use minimal ; then 982 if ! use minimal ; then
873 einfo "Including support files and sample configurations" 983 einfo "Including support files and sample configurations"
875 for script in \ 985 for script in \
876 "${S}"/support-files/my-*.cnf \ 986 "${S}"/support-files/my-*.cnf \
877 "${S}"/support-files/magic \ 987 "${S}"/support-files/magic \
878 "${S}"/support-files/ndb-config-2-node.ini 988 "${S}"/support-files/ndb-config-2-node.ini
879 do 989 do
880 dodoc "${script}" 990 [[ -f "$script" ]] && dodoc "${script}"
881 done 991 done
882 992
883 docinto "scripts" 993 docinto "scripts"
884 for script in "${S}"/scripts/mysql* ; do 994 for script in "${S}"/scripts/mysql* ; do
885 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 995 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
886 done 996 done
887 997
888 fi 998 fi
889 999
890 mysql_lib_symlinks "${D}" 1000 mysql_lib_symlinks "${D}"
924 for script in \ 1034 for script in \
925 support-files/my-*.cnf \ 1035 support-files/my-*.cnf \
926 support-files/magic \ 1036 support-files/magic \
927 support-files/ndb-config-2-node.ini 1037 support-files/ndb-config-2-node.ini
928 do 1038 do
1039 [[ -f "${script}" ]] \
929 dodoc "${script}" 1040 && dodoc "${script}"
930 done 1041 done
931 1042
932 docinto "scripts" 1043 docinto "scripts"
933 for script in scripts/mysql* ; do 1044 for script in scripts/mysql* ; do
1045 [[ -f "${script}" ]] \
934 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1046 && [[ "${script%.sh}" == "${script}" ]] \
1047 && dodoc "${script}"
935 done 1048 done
936 1049
937 einfo 1050 einfo
938 elog "You might want to run:" 1051 elog "You might want to run:"
939 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1052 elog "\"emerge --config =${CATEGORY}/${PF}\""
940 elog "if this is a new install." 1053 elog "if this is a new install."
941 einfo 1054 einfo
942 fi 1055 fi
943 1056
944 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 1057 if pbxt_available && use pbxt ; then
945 # TODO: explain it better 1058 # TODO: explain it better
946 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1059 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
947 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1060 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
948 elog "if, after that, you cannot start the MySQL server," 1061 elog "if, after that, you cannot start the MySQL server,"
949 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1062 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1000 fi 1113 fi
1001 fi 1114 fi
1002 1115
1003 local pwd1="a" 1116 local pwd1="a"
1004 local pwd2="b" 1117 local pwd2="b"
1118 local MYSQL_ROOT_PASSWORD=''
1005 local maxtry=5 1119 local maxtry=15
1120
1121 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1122 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1123 fi
1006 1124
1007 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1125 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1008 ewarn "You have already a MySQL database in place." 1126 ewarn "You have already a MySQL database in place."
1009 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1127 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1010 ewarn "Please rename or delete it if you wish to replace it." 1128 ewarn "Please rename or delete it if you wish to replace it."
1013 1131
1014 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1132 # Bug #213475 - MySQL _will_ object strenously if your machine is named
1015 # localhost. Also causes weird failures. 1133 # localhost. Also causes weird failures.
1016 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1134 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1017 1135
1018 einfo "Creating the mysql database and setting proper" 1136 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1019 einfo "permissions on it ..."
1020 1137
1021 einfo "Insert a password for the mysql 'root' user" 1138 einfo "Please provide a password for the mysql 'root' user now,"
1139 einfo "or in the MYSQL_ROOT_PASSWORD env var."
1022 ewarn "Avoid [\"'\\_%] characters in the password" 1140 ewarn "Avoid [\"'\\_%] characters in the password"
1023 read -rsp " >" pwd1 ; echo 1141 read -rsp " >" pwd1 ; echo
1024 1142
1025 einfo "Retype the password" 1143 einfo "Retype the password"
1026 read -rsp " >" pwd2 ; echo 1144 read -rsp " >" pwd2 ; echo
1027 1145
1028 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1146 if [[ "x$pwd1" != "x$pwd2" ]] ; then
1029 die "Passwords are not the same" 1147 die "Passwords are not the same"
1148 fi
1149 MYSQL_ROOT_PASSWORD="${pwd1}"
1150 unset pwd1 pwd2
1030 fi 1151 fi
1031 1152
1032 local options="" 1153 local options=""
1033 local sqltmp="$(emktemp)" 1154 local sqltmp="$(emktemp)"
1034 1155
1048 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1169 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1049 || die "MySQL databases not installed" 1170 || die "MySQL databases not installed"
1050 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1171 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1051 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1172 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1052 1173
1174 # Figure out which options we need to disable to do the setup
1175 helpfile="${TMPDIR}/mysqld-help"
1176 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1177 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1178 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1179 ; do
1180 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1181 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1182 done
1183 # But some options changed names
1184 egrep -sq external-locking "${helpfile}" && \
1185 options="${options/skip-locking/skip-external-locking}"
1186
1053 if mysql_version_is_at_least "4.1.3" ; then 1187 if mysql_version_is_at_least "4.1.3" ; then
1054 options="--skip-ndbcluster"
1055
1056 # Filling timezones, see 1188 # Filling timezones, see
1057 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1189 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1058 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1190 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1059 1191
1060 if [[ -r "${help_tables}" ]] ; then 1192 if [[ -r "${help_tables}" ]] ; then
1061 cat "${help_tables}" >> "${sqltmp}" 1193 cat "${help_tables}" >> "${sqltmp}"
1062 fi 1194 fi
1063 fi 1195 fi
1196
1197 einfo "Creating the mysql database and setting proper"
1198 einfo "permissions on it ..."
1064 1199
1065 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1200 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1066 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1201 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1067 local mysqld="${ROOT}/usr/sbin/mysqld \ 1202 local mysqld="${ROOT}/usr/sbin/mysqld \
1068 ${options} \ 1203 ${options} \
1069 --user=mysql \ 1204 --user=mysql \
1070 --skip-grant-tables \
1071 --basedir=${ROOT}/usr \ 1205 --basedir=${ROOT}/usr \
1072 --datadir=${ROOT}/${MY_DATADIR} \ 1206 --datadir=${ROOT}/${MY_DATADIR} \
1073 --skip-innodb \
1074 --skip-bdb \
1075 --skip-networking \
1076 --max_allowed_packet=8M \ 1207 --max_allowed_packet=8M \
1077 --net_buffer_length=16K \ 1208 --net_buffer_length=16K \
1209 --default-storage-engine=MyISAM \
1078 --socket=${socket} \ 1210 --socket=${socket} \
1079 --pid-file=${pidfile}" 1211 --pid-file=${pidfile}"
1212 #einfo "About to start mysqld: ${mysqld}"
1213 ebegin "Starting mysqld"
1080 ${mysqld} & 1214 ${mysqld} &
1215 rc=$?
1081 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1216 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1082 maxtry=$((${maxtry}-1)) 1217 maxtry=$((${maxtry}-1))
1083 echo -n "." 1218 echo -n "."
1084 sleep 1 1219 sleep 1
1085 done 1220 done
1221 eend $rc
1086 1222
1223 if ! [[ -S "${socket}" ]]; then
1224 die "Completely failed to start up mysqld with: ${mysqld}"
1225 fi
1226
1227 ebegin "Setting root password"
1087 # Do this from memory, as we don't want clear text passwords in temp files 1228 # Do this from memory, as we don't want clear text passwords in temp files
1088 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1229 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1089 "${ROOT}/usr/bin/mysql" \ 1230 "${ROOT}/usr/bin/mysql" \
1090 --socket=${socket} \ 1231 --socket=${socket} \
1091 -hlocalhost \ 1232 -hlocalhost \
1092 -e "${sql}" 1233 -e "${sql}"
1234 eend $?
1093 1235
1094 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1236 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1095
1096 "${ROOT}/usr/bin/mysql" \ 1237 "${ROOT}/usr/bin/mysql" \
1097 --socket=${socket} \ 1238 --socket=${socket} \
1098 -hlocalhost \ 1239 -hlocalhost \
1099 -uroot \ 1240 -uroot \
1100 -p"${pwd1}" \ 1241 -p"${MYSQL_ROOT_PASSWORD}" \
1101 mysql < "${sqltmp}" 1242 mysql < "${sqltmp}"
1243 rc=$?
1244 eend $?
1245 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1102 1246
1103 # Stop the server and cleanup 1247 # Stop the server and cleanup
1248 einfo "Stopping the server ..."
1104 kill $(< "${pidfile}" ) 1249 kill $(< "${pidfile}" )
1105 rm -f "${sqltmp}" 1250 rm -f "${sqltmp}"
1106 einfo "Stopping the server ..."
1107 wait %1 1251 wait %1
1108 einfo "Done" 1252 einfo "Done"
1109} 1253}
1110 1254
1111# @FUNCTION: mysql_pkg_postrm 1255# @FUNCTION: mysql_pkg_postrm

Legend:
Removed from v.1.127  
changed lines
  Added in v.1.144

  ViewVC Help
Powered by ViewVC 1.1.20