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

Diff of /eclass/mysql.eclass

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

Revision 1.126 Revision 1.142
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/mysql.eclass,v 1.126 2010/01/31 05:47:21 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.142 2010/03/24 20:37:54 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>
16# phase hooks. 16# phase hooks.
17 17
18WANT_AUTOCONF="latest" 18WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 19WANT_AUTOMAKE="latest"
20 20
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator 21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
22 22
23# Shorten the path because the socket path length must be shorter than 107 chars 23# 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 24# and we will run a mysql server during test phase
25S="${WORKDIR}/mysql" 25S="${WORKDIR}/mysql"
26 26
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
208# @FUNCTION: mysql_disable_test 257# @FUNCTION: mysql_disable_test
209# @DESCRIPTION: 258# @DESCRIPTION:
210# Helper function to disable specific tests. 259# Helper function to disable specific tests.
211mysql_disable_test() { 260mysql_disable_test() {
261 local rawtestname testname testsuite reason mysql_disable_file
212 local testname="${1}" ; shift 262 rawtestname="${1}" ; shift
213 local reason="${@}" 263 reason="${@}"
264 ewarn "test '${rawtestname}' disabled: '${reason}'"
265
266 testsuite="${rawtestname/.*}"
267 testname="${rawtestname/*.}"
214 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 268 mysql_disable_file="${S}/mysql-test/t/disabled.def"
269 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
215 echo ${testname} : ${reason} >> "${mysql_disable_file}" 270 echo ${testname} : ${reason} >> "${mysql_disable_file}"
216 ewarn "test '${testname}' disabled: '${reason}'" 271
272 # ${S}/mysql-tests/t/disabled.def
273 #
274 # ${S}/mysql-tests/suite/federated/disabled.def
275 #
276 # ${S}/mysql-tests/suite/jp/t/disabled.def
277 # ${S}/mysql-tests/suite/ndb/t/disabled.def
278 # ${S}/mysql-tests/suite/rpl/t/disabled.def
279 # ${S}/mysql-tests/suite/parts/t/disabled.def
280 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
281 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
282 # ${S}/mysql-tests/suite/binlog/t/disabled.def
283 # ${S}/mysql-tests/suite/innodb/t/disabled.def
284 if [ -n "${testsuite}" ]; then
285 for mysql_disable_file in \
286 ${S}/mysql-test/suite/${testsuite}/disabled.def \
287 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
288 FAILED ; do
289 [ -f "${mysql_disable_file}" ] && break
290 done
291 if [ "${mysql_disabled_file}" != "FAILED" ]; then
292 echo "${testname} : ${reason}" >> "${mysql_disable_file}"
293 else
294 ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
295 fi
296 fi
217} 297}
218 298
219# @FUNCTION: mysql_init_vars 299# @FUNCTION: mysql_init_vars
220# @DESCRIPTION: 300# @DESCRIPTION:
221# void mysql_init_vars() 301# void mysql_init_vars()
364 myconf="${myconf} $(use_with perl bench)" 444 myconf="${myconf} $(use_with perl bench)"
365 myconf="${myconf} --enable-assembler" 445 myconf="${myconf} --enable-assembler"
366 myconf="${myconf} --with-extra-tools" 446 myconf="${myconf} --with-extra-tools"
367 myconf="${myconf} --with-innodb" 447 myconf="${myconf} --with-innodb"
368 myconf="${myconf} --without-readline" 448 myconf="${myconf} --without-readline"
449 myconf="${myconf} $(use_with ssl openssl)"
369 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)"
370 451
371 # --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
372 # has been removed from configure 453 # has been removed from configure
454 # Apply to 4.x and 5.0.[0-3]
373 if use ssl ; then 455 if use ssl ; then
374 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"
375 fi
376
377 if mysql_version_is_at_least "5.1.11" ; then
378 myconf="${myconf} $(use_with ssl)"
379 else
380 myconf="${myconf} $(use_with ssl openssl)"
381 fi 457 fi
382 458
383 if mysql_version_is_at_least "5.0.60" ; then 459 if mysql_version_is_at_least "5.0.60" ; then
384 if use berkdb ; then 460 if use berkdb ; then
385 elog "Berkeley DB support was disabled due to build failures" 461 elog "Berkeley DB support was disabled due to build failures"
442 518
443configure_51() { 519configure_51() {
444 # TODO: !!!! readd --without-readline 520 # TODO: !!!! readd --without-readline
445 # the failure depend upon config/ac-macros/readline.m4 checking into 521 # the failure depend upon config/ac-macros/readline.m4 checking into
446 # readline.h instead of history.h 522 # readline.h instead of history.h
447 myconf="${myconf} $(use_with ssl)" 523 myconf="${myconf} $(use_with ssl ssl /usr)"
448 myconf="${myconf} --enable-assembler" 524 myconf="${myconf} --enable-assembler"
449 myconf="${myconf} --with-geometry" 525 myconf="${myconf} --with-geometry"
450 myconf="${myconf} --with-readline" 526 myconf="${myconf} --with-readline"
451 myconf="${myconf} --with-row-based-replication"
452 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 527 myconf="${myconf} --with-zlib-dir=/usr/"
453 myconf="${myconf} --without-pstack" 528 myconf="${myconf} --without-pstack"
454 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
455 538
456 # 5.1 introduces a new way to manage storage engines (plugins) 539 # 5.1 introduces a new way to manage storage engines (plugins)
457 # like configuration=none 540 # like configuration=none
541 # This base set are required, and will always be statically built.
458 local plugins="csv,myisam,myisammrg,heap" 542 local plugins="csv,myisam,myisammrg,heap"
459 if use extraengine ; then 543 if use extraengine ; then
460 # 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
461 plugins="${plugins},archive,blackhole,example,federated,partition" 547 plugins="${plugins},archive,blackhole,federated,partition"
462 548
549 if [[ "${PN}" != "mariadb" ]] ; then
463 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"
464 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"
465 fi 555 fi
556 fi
466 557
467 # Upstream specifically requests that InnoDB always be built. 558 # Upstream specifically requests that InnoDB always be built:
468 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
469 564
470 # like configuration=max-no-ndb 565 # like configuration=max-no-ndb
471 if use cluster ; then 566 if use cluster ; then
472 plugins="${plugins},ndbcluster" 567 plugins="${plugins},ndbcluster"
473 myconf="${myconf} --with-ndb-binlog" 568 myconf="${myconf} --with-ndb-binlog"
474 fi 569 fi
475 570
476 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
477 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"
478 fi 584 fi
479 585
480 myconf="${myconf} --with-plugins=${plugins}" 586 myconf="${myconf} --with-plugins=${plugins}"
481} 587}
482 588
487 593
488 einfo "Reconfiguring dir '${PWD}'" 594 einfo "Reconfiguring dir '${PWD}'"
489 AT_GNUCONF_UPDATE="yes" eautoreconf 595 AT_GNUCONF_UPDATE="yes" eautoreconf
490 596
491 local myconf="" 597 local myconf=""
492 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 598 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
493 use debug && myconf="${myconf} --with-debug=full" 599 use debug && myconf="${myconf} --with-debug=full"
494 # TODO: is it safe/needed to use econf here ?
495 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 600 econf ${myconf} || die "Problem configuring PBXT storage engine"
496} 601}
497 602
498pbxt_src_compile() { 603pbxt_src_compile() {
499 # Be backwards compatible for now 604 # Be backwards compatible for now
500 if [[ $EAPI != 2 ]]; then 605 if [[ $EAPI != 2 ]]; then
507 # TODO: modify test suite for PBXT 612 # TODO: modify test suite for PBXT
508} 613}
509 614
510pbxt_src_install() { 615pbxt_src_install() {
511 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 616 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
512 make install || die "Failed to install PBXT" 617 emake install DESTDIR="${D}" || die "Failed to install PBXT"
513 popd 618 popd
514} 619}
515 620
516# 621#
517# EBUILD FUNCTIONS 622# EBUILD FUNCTIONS
553 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 658 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
554 fi 659 fi
555 660
556 # Bug #290570 fun. Upstream made us need a fairly new GCC4. 661 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
557 if mysql_version_is_at_least "5.0.83" ; then 662 if mysql_version_is_at_least "5.0.83" ; then
558 GCC_VER=$(gcc_version) 663 GCC_VER=$(gcc-version)
559 case ${GCC_VER} in 664 case ${GCC_VER} in
560 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 665 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
561 esac 666 esac
562 fi 667 fi
563 668
566 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 671 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
567 672
568 mysql_check_version_range "4.0 to 5.0.99.99" \ 673 mysql_check_version_range "4.0 to 5.0.99.99" \
569 && use berkdb \ 674 && use berkdb \
570 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 675 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
676
677 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
678 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
679 ewarn "5.1 series should NOT be put into production. In the near"
680 ewarn "future, it will be disabled from building."
681 ewarn ""
682 ewarn "If you need NDB support, you should instead move to the new"
683 ewarn "mysql-cluster package that represents that upstream NDB"
684 ewarn "development."
685 fi
571} 686}
572 687
573# @FUNCTION: mysql_src_unpack 688# @FUNCTION: mysql_src_unpack
574# @DESCRIPTION: 689# @DESCRIPTION:
575# Unpack the source code and call mysql_src_prepare for EAPI < 2. 690# Unpack the source code and call mysql_src_prepare for EAPI < 2.
604 # Now link in right patches 719 # Now link in right patches
605 mysql_mv_patches 720 mysql_mv_patches
606 # And apply 721 # And apply
607 epatch 722 epatch
608 723
724 # last -fPIC fixup, per bug #305873
725 i="${S}"/storage/innodb_plugin/plug.in
726 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
727
609 # Additional checks, remove bundled zlib 728 # Additional checks, remove bundled zlib
610 rm -f "${S}/zlib/"*.[ch] 729 rm -f "${S}/zlib/"*.[ch]
611 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 730 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
612 rm -f "scripts/mysqlbug" 731 rm -f "scripts/mysqlbug"
613 732
626 rm -f "scripts/mysqlbug" 745 rm -f "scripts/mysqlbug"
627 fi 746 fi
628 747
629 local rebuilddirlist d 748 local rebuilddirlist d
630 749
631 if mysql_version_is_at_least "5.1.26" && use xtradb ; then 750 if xtradb_patch_available && use xtradb ; then
632 einfo "Replacing InnoDB with Percona XtraDB" 751 einfo "Replacing InnoDB with Percona XtraDB"
633 pushd "${S}"/storage 752 pushd "${S}"/storage
634 i="innobase" 753 i="innobase"
635 o="${WORKDIR}/storage-${i}.mysql-upstream" 754 o="${WORKDIR}/storage-${i}.mysql-upstream"
636 # Have we been here already? 755 # Have we been here already?
637 [ -h "${i}" ] && rm -f "${i}" 756 [ -d "${o}" ] && rm -f "${i}"
638 # Or maybe we haven't 757 # Or maybe we haven't
639 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 758 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
640 ln -s "${WORKDIR}/${XTRADB_P}" "${i}" 759 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
641 popd 760 popd
642 fi 761 fi
643 762
644 if mysql_version_is_at_least "5.1.12" ; then 763 if mysql_version_is_at_least "5.1.12" ; then
645 einfo "Updating innobase cmake"
646 rebuilddirlist="." 764 rebuilddirlist="."
765 # This does not seem to be needed presently. robbat2 2010/02/23
766 #einfo "Updating innobase cmake"
647 # TODO: check this with a cmake expert 767 ## TODO: check this with a cmake expert
648 cmake \ 768 #cmake \
649 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 769 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
650 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 770 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
651 "storage/innobase" 771 # "storage/innobase"
652 else 772 else
653 rebuilddirlist=". innobase" 773 rebuilddirlist=". innobase"
654 fi 774 fi
655 775
656 for d in ${rebuilddirlist} ; do 776 for d in ${rebuilddirlist} ; do
740 find . -type f -name Makefile -print0 \ 860 find . -type f -name Makefile -print0 \
741 | xargs -0 -n100 sed -i \ 861 | xargs -0 -n100 sed -i \
742 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 862 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
743 863
744 if [[ $EAPI == 2 ]]; then 864 if [[ $EAPI == 2 ]]; then
745 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 865 pbxt_patch_available && use pbxt && pbxt_src_configure
746 fi 866 fi
747} 867}
748 868
749# @FUNCTION: mysql_src_compile 869# @FUNCTION: mysql_src_compile
750# @DESCRIPTION: 870# @DESCRIPTION:
751# Compile the mysql code. 871# Compile the mysql code.
752mysql_src_compile() { 872mysql_src_compile() {
753 # Be backwards compatible for now 873 # Be backwards compatible for now
754 case ${EAPI:-0} in 874 case ${EAPI:-0} in
755 2) : ;; 875 2) : ;;
756 0 | 1) mysql_src_configure ;; 876 0 | 1) mysql_src_configure ;;
757 esac 877 esac
758 878
759 emake || die "emake failed" 879 emake || die "emake failed"
760 880
761 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 881 pbxt_patch_available && use pbxt && pbxt_src_compile
762} 882}
763 883
764# @FUNCTION: mysql_src_install 884# @FUNCTION: mysql_src_install
765# @DESCRIPTION: 885# @DESCRIPTION:
766# Install mysql. 886# Install mysql.
767mysql_src_install() { 887mysql_src_install() {
768 # Make sure the vars are correctly initialized 888 # Make sure the vars are correctly initialized
769 mysql_init_vars 889 mysql_init_vars
770 890
771 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 891 emake install \
892 DESTDIR="${D}" \
893 benchdir_root="${MY_SHAREDSTATEDIR}" \
894 testroot="${MY_SHAREDSTATEDIR}" \
895 || die "emake install failed"
772 896
773 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 897 pbxt_patch_available && use pbxt && pbxt_src_install
774 898
775 # Convenience links 899 # Convenience links
776 einfo "Making Convenience links for mysqlcheck multi-call binary" 900 einfo "Making Convenience links for mysqlcheck multi-call binary"
777 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 901 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
778 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 902 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
782 einfo "Removing duplicate /usr/share/mysql files" 906 einfo "Removing duplicate /usr/share/mysql files"
783 rm -Rf "${D}/usr/share/info" 907 rm -Rf "${D}/usr/share/info"
784 for removeme in "mysql-log-rotate" mysql.server* \ 908 for removeme in "mysql-log-rotate" mysql.server* \
785 binary-configure* my-*.cnf mi_test_all* 909 binary-configure* my-*.cnf mi_test_all*
786 do 910 do
787 rm -f "${D}"/usr/share/mysql/${removeme} 911 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
788 done 912 done
789 913
790 # Clean up stuff for a minimal build 914 # Clean up stuff for a minimal build
791 if use minimal ; then 915 if use minimal ; then
792 einfo "Remove all extra content for minimal build" 916 einfo "Remove all extra content for minimal build"
794 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} 918 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}
795 rm -f "${D}/usr/sbin/mysqld" 919 rm -f "${D}/usr/sbin/mysqld"
796 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 920 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
797 fi 921 fi
798 922
923 # Unless they explicitly specific USE=test, then do not install the
924 # testsuite. It DOES have a use to be installed, esp. when you want to do a
925 # validation of your database configuration after tuning it.
926 if use !test ; then
927 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
928 fi
929
799 # Configuration stuff 930 # Configuration stuff
931 if mysql_version_is_at_least "5.1" ; then
932 mysql_mycnf_version="5.1"
800 if mysql_version_is_at_least "4.1" ; then 933 elif mysql_version_is_at_least "4.1" ; then
801 mysql_mycnf_version="4.1" 934 mysql_mycnf_version="4.1"
802 else 935 else
803 mysql_mycnf_version="4.0" 936 mysql_mycnf_version="4.0"
804 fi 937 fi
805 einfo "Building default my.cnf" 938 einfo "Building default my.cnf"
807 doins scripts/mysqlaccess.conf 940 doins scripts/mysqlaccess.conf
808 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 941 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
809 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 942 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
810 > "${TMPDIR}/my.cnf.ok" 943 > "${TMPDIR}/my.cnf.ok"
811 if mysql_version_is_at_least "4.1" && use latin1 ; then 944 if mysql_version_is_at_least "4.1" && use latin1 ; then
812 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 945 sed -i \
946 -e "/character-set/s|utf8|latin1|g" \
947 "${TMPDIR}/my.cnf.ok"
813 fi 948 fi
814 newins "${TMPDIR}/my.cnf.ok" my.cnf 949 newins "${TMPDIR}/my.cnf.ok" my.cnf
815 950
816 # Minimal builds don't have the MySQL server 951 # Minimal builds don't have the MySQL server
817 if ! use minimal ; then 952 if ! use minimal ; then
832 done 967 done
833 fi 968 fi
834 969
835 # Docs 970 # Docs
836 einfo "Installing docs" 971 einfo "Installing docs"
837 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 972 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
838 doinfo "${S}"/Docs/mysql.info 973 doinfo "${S}"/Docs/mysql.info
839 974
840 # Minimal builds don't have the MySQL server 975 # Minimal builds don't have the MySQL server
841 if ! use minimal ; then 976 if ! use minimal ; then
842 einfo "Including support files and sample configurations" 977 einfo "Including support files and sample configurations"
844 for script in \ 979 for script in \
845 "${S}"/support-files/my-*.cnf \ 980 "${S}"/support-files/my-*.cnf \
846 "${S}"/support-files/magic \ 981 "${S}"/support-files/magic \
847 "${S}"/support-files/ndb-config-2-node.ini 982 "${S}"/support-files/ndb-config-2-node.ini
848 do 983 do
849 dodoc "${script}" 984 [[ -f "$script" ]] && dodoc "${script}"
850 done 985 done
851 986
852 docinto "scripts" 987 docinto "scripts"
853 for script in "${S}"/scripts/mysql* ; do 988 for script in "${S}"/scripts/mysql* ; do
854 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 989 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
855 done 990 done
856 991
857 fi 992 fi
858 993
859 mysql_lib_symlinks "${D}" 994 mysql_lib_symlinks "${D}"
893 for script in \ 1028 for script in \
894 support-files/my-*.cnf \ 1029 support-files/my-*.cnf \
895 support-files/magic \ 1030 support-files/magic \
896 support-files/ndb-config-2-node.ini 1031 support-files/ndb-config-2-node.ini
897 do 1032 do
1033 [[ -f "${script}" ]] \
898 dodoc "${script}" 1034 && dodoc "${script}"
899 done 1035 done
900 1036
901 docinto "scripts" 1037 docinto "scripts"
902 for script in scripts/mysql* ; do 1038 for script in scripts/mysql* ; do
1039 [[ -f "${script}" ]] \
903 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1040 && [[ "${script%.sh}" == "${script}" ]] \
1041 && dodoc "${script}"
904 done 1042 done
905 1043
906 einfo 1044 einfo
907 elog "You might want to run:" 1045 elog "You might want to run:"
908 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1046 elog "\"emerge --config =${CATEGORY}/${PF}\""
909 elog "if this is a new install." 1047 elog "if this is a new install."
910 einfo 1048 einfo
911 fi 1049 fi
912 1050
913 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 1051 if pbxt_available && use pbxt ; then
914 # TODO: explain it better 1052 # TODO: explain it better
915 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1053 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
916 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1054 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
917 elog "if, after that, you cannot start the MySQL server," 1055 elog "if, after that, you cannot start the MySQL server,"
918 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1056 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
969 fi 1107 fi
970 fi 1108 fi
971 1109
972 local pwd1="a" 1110 local pwd1="a"
973 local pwd2="b" 1111 local pwd2="b"
1112 local MYSQL_ROOT_PASSWORD=''
974 local maxtry=5 1113 local maxtry=15
1114
1115 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1116 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1117 fi
975 1118
976 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1119 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
977 ewarn "You have already a MySQL database in place." 1120 ewarn "You have already a MySQL database in place."
978 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1121 ewarn "(${ROOT}/${MY_DATADIR}/*)"
979 ewarn "Please rename or delete it if you wish to replace it." 1122 ewarn "Please rename or delete it if you wish to replace it."
982 1125
983 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1126 # Bug #213475 - MySQL _will_ object strenously if your machine is named
984 # localhost. Also causes weird failures. 1127 # localhost. Also causes weird failures.
985 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1128 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
986 1129
987 einfo "Creating the mysql database and setting proper" 1130 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
988 einfo "permissions on it ..."
989 1131
990 einfo "Insert a password for the mysql 'root' user" 1132 einfo "Please provide a password for the mysql 'root' user now,"
1133 einfo "or in the MYSQL_ROOT_PASSWORD env var."
991 ewarn "Avoid [\"'\\_%] characters in the password" 1134 ewarn "Avoid [\"'\\_%] characters in the password"
992 read -rsp " >" pwd1 ; echo 1135 read -rsp " >" pwd1 ; echo
993 1136
994 einfo "Retype the password" 1137 einfo "Retype the password"
995 read -rsp " >" pwd2 ; echo 1138 read -rsp " >" pwd2 ; echo
996 1139
997 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1140 if [[ "x$pwd1" != "x$pwd2" ]] ; then
998 die "Passwords are not the same" 1141 die "Passwords are not the same"
1142 fi
1143 MYSQL_ROOT_PASSWORD="${pwd1}"
1144 unset pwd1 pwd2
999 fi 1145 fi
1000 1146
1001 local options="" 1147 local options=""
1002 local sqltmp="$(emktemp)" 1148 local sqltmp="$(emktemp)"
1003 1149
1017 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1163 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1018 || die "MySQL databases not installed" 1164 || die "MySQL databases not installed"
1019 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1165 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1020 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1166 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1021 1167
1168 # Figure out which options we need to disable to do the setup
1169 helpfile="${TMPDIR}/mysqld-help"
1170 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1171 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1172 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1173 ; do
1174 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1175 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1176 done
1177 # But some options changed names
1178 egrep -sq external-locking "${helpfile}" && \
1179 options="${options/skip-locking/skip-external-locking}"
1180
1022 if mysql_version_is_at_least "4.1.3" ; then 1181 if mysql_version_is_at_least "4.1.3" ; then
1023 options="--skip-ndbcluster"
1024
1025 # Filling timezones, see 1182 # Filling timezones, see
1026 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1183 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1027 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1184 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1028 1185
1029 if [[ -r "${help_tables}" ]] ; then 1186 if [[ -r "${help_tables}" ]] ; then
1030 cat "${help_tables}" >> "${sqltmp}" 1187 cat "${help_tables}" >> "${sqltmp}"
1031 fi 1188 fi
1032 fi 1189 fi
1190
1191 einfo "Creating the mysql database and setting proper"
1192 einfo "permissions on it ..."
1033 1193
1034 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1194 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1035 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1195 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1036 local mysqld="${ROOT}/usr/sbin/mysqld \ 1196 local mysqld="${ROOT}/usr/sbin/mysqld \
1037 ${options} \ 1197 ${options} \
1038 --user=mysql \ 1198 --user=mysql \
1039 --skip-grant-tables \
1040 --basedir=${ROOT}/usr \ 1199 --basedir=${ROOT}/usr \
1041 --datadir=${ROOT}/${MY_DATADIR} \ 1200 --datadir=${ROOT}/${MY_DATADIR} \
1042 --skip-innodb \
1043 --skip-bdb \
1044 --skip-networking \
1045 --max_allowed_packet=8M \ 1201 --max_allowed_packet=8M \
1046 --net_buffer_length=16K \ 1202 --net_buffer_length=16K \
1047 --socket=${socket} \ 1203 --socket=${socket} \
1048 --pid-file=${pidfile}" 1204 --pid-file=${pidfile}"
1205 #einfo "About to start mysqld: ${mysqld}"
1206 ebegin "Starting mysqld"
1049 ${mysqld} & 1207 ${mysqld} &
1208 rc=$?
1050 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1209 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1051 maxtry=$((${maxtry}-1)) 1210 maxtry=$((${maxtry}-1))
1052 echo -n "." 1211 echo -n "."
1053 sleep 1 1212 sleep 1
1054 done 1213 done
1214 eend $rc
1055 1215
1216 if ! [[ -S "${socket}" ]]; then
1217 die "Completely failed to start up mysqld with: ${mysqld}"
1218 fi
1219
1220 ebegin "Setting root password"
1056 # Do this from memory, as we don't want clear text passwords in temp files 1221 # Do this from memory, as we don't want clear text passwords in temp files
1057 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1222 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1058 "${ROOT}/usr/bin/mysql" \ 1223 "${ROOT}/usr/bin/mysql" \
1059 --socket=${socket} \ 1224 --socket=${socket} \
1060 -hlocalhost \ 1225 -hlocalhost \
1061 -e "${sql}" 1226 -e "${sql}"
1227 eend $?
1062 1228
1063 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1229 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1064
1065 "${ROOT}/usr/bin/mysql" \ 1230 "${ROOT}/usr/bin/mysql" \
1066 --socket=${socket} \ 1231 --socket=${socket} \
1067 -hlocalhost \ 1232 -hlocalhost \
1068 -uroot \ 1233 -uroot \
1069 -p"${pwd1}" \ 1234 -p"${MYSQL_ROOT_PASSWORD}" \
1070 mysql < "${sqltmp}" 1235 mysql < "${sqltmp}"
1236 rc=$?
1237 eend $?
1238 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1071 1239
1072 # Stop the server and cleanup 1240 # Stop the server and cleanup
1241 einfo "Stopping the server ..."
1073 kill $(< "${pidfile}" ) 1242 kill $(< "${pidfile}" )
1074 rm -f "${sqltmp}" 1243 rm -f "${sqltmp}"
1075 einfo "Stopping the server ..."
1076 wait %1 1244 wait %1
1077 einfo "Done" 1245 einfo "Done"
1078} 1246}
1079 1247
1080# @FUNCTION: mysql_pkg_postrm 1248# @FUNCTION: mysql_pkg_postrm

Legend:
Removed from v.1.126  
changed lines
  Added in v.1.142

  ViewVC Help
Powered by ViewVC 1.1.20