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

Diff of /eclass/mysql.eclass

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

Revision 1.144 Revision 1.163
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.144 2010/04/01 20:36:39 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.163 2011/08/21 16:14:56 jmbsvicetto 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}
135 !minimal? ( dev-db/mysql-init-scripts ) 145 !minimal? ( dev-db/mysql-init-scripts )
136 selinux? ( sec-policy/selinux-mysql )" 146 selinux? ( sec-policy/selinux-mysql )"
137 147
148DEPEND="${DEPEND}
149 virtual/yacc"
150
151if [ "${EAPI:-0}" = "2" ]; then
152 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
153fi
154
138# compile-time-only 155# compile-time-only
139mysql_version_is_at_least "5.1" \ 156mysql_version_is_at_least "5.1" \
140|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 157|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
141 158
142# compile-time-only 159# compile-time-only
143mysql_version_is_at_least "5.1.12" \ 160mysql_version_is_at_least "5.1.12" \
144&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 161&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
162
163[[ "${PN}" == "mariadb" ]] \
164&& mysql_version_is_at_least "5.2" \
165&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
166#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
167# sphinx? ( app-misc/sphinx )"
145 168
146# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 169# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
147PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 170PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
148 171
149# For other stuff to bring us in 172# For other stuff to bring us in
152# Work out the default SERVER_URI correctly 175# Work out the default SERVER_URI correctly
153if [ -z "${SERVER_URI}" ]; then 176if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 177 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 178 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 179 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
180 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
181 SERVER_URI="
182 http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
183 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
184 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" 185 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
186 http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
187 http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
188 "
158 # The community build is on the mirrors 189 # The community and cluster builds are on the mirrors
159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 190 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" 191 if [[ "${PN}" == "mysql-cluster" ]] ; then
192 URI_DIR="MySQL-Cluster"
193 URI_FILE="mysql-cluster-gpl"
194 else
195 URI_DIR="MySQL"
196 URI_FILE="mysql"
197 fi
198 URI_A="${URI_FILE}-${MY_PV}.tar.gz"
199 MIRROR_PV=$(get_version_component_range 1-2 ${PV})
200 # Recently upstream switched to an archive site, and not on mirrors
201 SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
202 mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
161 # The (old) enterprise source is on the primary site only 203 # The (old) enterprise source is on the primary site only
162 elif [ "${PN}" == "mysql" ]; then 204 elif [ "${PN}" == "mysql" ]; then
163 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" 205 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
164 fi 206 fi
165fi 207fi
188IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test" 230IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
189 231
190mysql_version_is_at_least "4.1" \ 232mysql_version_is_at_least "4.1" \
191&& IUSE="${IUSE} latin1" 233&& IUSE="${IUSE} latin1"
192 234
193mysql_version_is_at_least "4.1.3" \ 235if mysql_version_is_at_least "4.1.3" ; then
194&& IUSE="${IUSE} cluster extraengine" 236 IUSE="${IUSE} extraengine"
237 if [[ "${PN}" != "mysql-cluster" ]] ; then
238 IUSE="${IUSE} cluster"
239 fi
240fi
195 241
196mysql_version_is_at_least "5.0" \ 242mysql_version_is_at_least "5.0" \
197|| IUSE="${IUSE} raid" 243|| IUSE="${IUSE} raid"
198 244
199mysql_version_is_at_least "5.0.18" \ 245mysql_version_is_at_least "5.0.18" \
205[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 251[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
206&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 252&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
207 253
208[[ "${PN}" == "mariadb" ]] \ 254[[ "${PN}" == "mariadb" ]] \
209&& IUSE="${IUSE} libevent" 255&& IUSE="${IUSE} libevent"
256
257[[ "${PN}" == "mariadb" ]] \
258&& mysql_version_is_at_least "5.2" \
259&& IUSE="${IUSE} oqgraph"
260#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
261#&& IUSE="${IUSE} oqgraph sphinx"
210 262
211# MariaDB has integrated PBXT 263# MariaDB has integrated PBXT
212# PBXT_VERSION means that we have a PBXT patch for this PV 264# PBXT_VERSION means that we have a PBXT patch for this PV
213# PBXT was only introduced after 5.1.12 265# PBXT was only introduced after 5.1.12
214pbxt_patch_available() { 266pbxt_patch_available() {
232 && mysql_version_is_at_least "5.1.26" \ 284 && mysql_version_is_at_least "5.1.26" \
233 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 285 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
234 return $? 286 return $?
235} 287}
236 288
289
237pbxt_patch_available \ 290pbxt_patch_available \
238&& PBXT_P="pbxt-${PBXT_VERSION}" \ 291&& 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" \ 292&& 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} )" \ 293&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
241 294
295# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
296# vs. built outside the dir
242pbxt_available \ 297pbxt_available \
243&& IUSE="${IUSE} pbxt" 298&& IUSE="${IUSE} pbxt" \
299&& mysql_version_is_at_least "5.1.40" \
300&& PBXT_NEWSTYLE=1
244 301
245xtradb_patch_available \ 302xtradb_patch_available \
246&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 303&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
247&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 304&& 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}" \ 305&& XTRADB_SRC_B1="http://www.percona.com/" \
306&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
307&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
249&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \ 308&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
309&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
250&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \ 310&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
251&& IUSE="${IUSE} xtradb" 311&& IUSE="${IUSE} xtradb"
252 312
253# 313#
254# HELPER FUNCTIONS: 314# HELPER FUNCTIONS:
255# 315#
260mysql_disable_test() { 320mysql_disable_test() {
261 local rawtestname testname testsuite reason mysql_disable_file 321 local rawtestname testname testsuite reason mysql_disable_file
262 rawtestname="${1}" ; shift 322 rawtestname="${1}" ; shift
263 reason="${@}" 323 reason="${@}"
264 ewarn "test '${rawtestname}' disabled: '${reason}'" 324 ewarn "test '${rawtestname}' disabled: '${reason}'"
265 325
266 testsuite="${rawtestname/.*}" 326 testsuite="${rawtestname/.*}"
267 testname="${rawtestname/*.}" 327 testname="${rawtestname/*.}"
268 mysql_disable_file="${S}/mysql-test/t/disabled.def" 328 mysql_disable_file="${S}/mysql-test/t/disabled.def"
269 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 329 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
270 echo ${testname} : ${reason} >> "${mysql_disable_file}" 330 echo ${testname} : ${reason} >> "${mysql_disable_file}"
352 MY_DATADIR="${new_MY_DATADIR}" 412 MY_DATADIR="${new_MY_DATADIR}"
353 fi 413 fi
354 fi 414 fi
355 fi 415 fi
356 416
417 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
357 MY_SOURCEDIR=${SERVER_URI##*/} 418 MY_SOURCEDIR=${SERVER_URI##*/}
358 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 419 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
420 fi
359 421
360 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 422 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
361 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 423 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
362 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 424 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
363} 425}
410 if use debug ; then 472 if use debug ; then
411 myconf="${myconf} --with-debug=full" 473 myconf="${myconf} --with-debug=full"
412 else 474 else
413 myconf="${myconf} --without-debug" 475 myconf="${myconf} --without-debug"
414 mysql_version_is_at_least "4.1.3" \ 476 mysql_version_is_at_least "4.1.3" \
415 && use cluster \ 477 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
416 && myconf="${myconf} --without-ndb-debug" 478 && myconf="${myconf} --without-ndb-debug"
417 fi 479 fi
418 480
419 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 481 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
420 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 482 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
477 myconf="${myconf} --without-berkeley-db" 539 myconf="${myconf} --without-berkeley-db"
478 fi 540 fi
479 541
480 if mysql_version_is_at_least "4.1.3" ; then 542 if mysql_version_is_at_least "4.1.3" ; then
481 myconf="${myconf} --with-geometry" 543 myconf="${myconf} --with-geometry"
544 if [[ "${PN}" != "mysql-cluster" ]] ; then
482 myconf="${myconf} $(use_with cluster ndbcluster)" 545 myconf="${myconf} $(use_with cluster ndbcluster)"
546 fi
483 fi 547 fi
484 548
485 if mysql_version_is_at_least "4.1.3" && use extraengine ; then 549 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
486 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 550 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
487 myconf="${myconf} --with-archive-storage-engine" 551 myconf="${myconf} --with-archive-storage-engine"
524 myconf="${myconf} --enable-assembler" 588 myconf="${myconf} --enable-assembler"
525 myconf="${myconf} --with-geometry" 589 myconf="${myconf} --with-geometry"
526 myconf="${myconf} --with-readline" 590 myconf="${myconf} --with-readline"
527 myconf="${myconf} --with-zlib-dir=/usr/" 591 myconf="${myconf} --with-zlib-dir=/usr/"
528 myconf="${myconf} --without-pstack" 592 myconf="${myconf} --without-pstack"
593 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
594
595 # This is an explict die here, because if we just forcibly disable it, then the
596 # user's data is not accessible.
597 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
529 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 598 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
530 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 599 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
531 myconf="${myconf} $(use_enable community community-features)" 600 myconf="${myconf} $(use_enable community community-features)"
532 if use community; then 601 if use community; then
533 myconf="${myconf} $(use_enable profiling)" 602 myconf="${myconf} $(use_enable profiling)"
534 else 603 else
535 myconf="${myconf} --disable-profiling" 604 myconf="${myconf} --disable-profiling"
536 fi 605 fi
537 fi 606 fi
538 607
608 # Scan for all available plugins
609 local plugins_avail="$(
610 LANG=C \
611 find "${S}" \
612 \( \
613 -name 'plug.in' \
614 -o -iname 'configure.in' \
615 -o -iname 'configure.ac' \
616 \) \
617 -print0 \
618 | xargs -0 sed -r -n \
619 -e '/^MYSQL_STORAGE_ENGINE/{
620 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
621 s~^([^ ]+).*~\1~gp;
622 }' \
623 | tr -s '\n' ' '
624 )"
625
539 # 5.1 introduces a new way to manage storage engines (plugins) 626 # 5.1 introduces a new way to manage storage engines (plugins)
540 # like configuration=none 627 # like configuration=none
541 # This base set are required, and will always be statically built. 628 # This base set are required, and will always be statically built.
542 local plugins="csv,myisam,myisammrg,heap" 629 local plugins_sta="csv myisam myisammrg heap"
630 local plugins_dyn=""
631 local plugins_dis="example ibmdb2i"
632
633 # These aren't actually required by the base set, but are really useful:
634 plugins_sta="${plugins_sta} archive blackhole"
635
636 # default in 5.5.4
637 if mysql_version_is_at_least "5.5.4" ; then
638 plugins_sta="${plugins_sta} partition"
639 fi
640 # Now the extras
543 if use extraengine ; then 641 if use extraengine ; then
544 # like configuration=max-no-ndb, archive and example removed in 5.1.11 642 # like configuration=max-no-ndb, archive and example removed in 5.1.11
545 # not added yet: ibmdb2i 643 # not added yet: ibmdb2i
546 # Not supporting as examples: example,daemon_example,ftexample 644 # Not supporting as examples: example,daemon_example,ftexample
547 plugins="${plugins},archive,blackhole,federated,partition" 645 plugins_sta="${plugins_sta} partition"
548 646
549 if [[ "${PN}" != "mariadb" ]] ; then 647 if [[ "${PN}" != "mariadb" ]] ; then
550 elog "Before using the Federated storage engine, please be sure to read" 648 elog "Before using the Federated storage engine, please be sure to read"
551 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 649 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
650 plugins_dyn="${plugins_sta} federated"
552 else 651 else
553 elog "MariaDB includes the FederatedX engine. Be sure to read" 652 elog "MariaDB includes the FederatedX engine. Be sure to read"
554 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 653 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
654 plugins_dyn="${plugins_sta} federatedx"
555 fi 655 fi
656 else
657 plugins_dis="${plugins_dis} partition federated"
556 fi 658 fi
557 659
558 # Upstream specifically requests that InnoDB always be built: 660 # Upstream specifically requests that InnoDB always be built:
559 # - innobase, innodb_plugin 661 # - innobase, innodb_plugin
560 # Build falcon if available for 6.x series. 662 # Build falcon if available for 6.x series.
561 for i in innobase innodb_plugin falcon ; do 663 for i in innobase falcon ; do
562 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 664 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
563 done 665 done
666 for i in innodb_plugin ; do
667 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
668 done
564 669
565 # like configuration=max-no-ndb 670 # like configuration=max-no-ndb
566 if use cluster ; then 671 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
567 plugins="${plugins},ndbcluster" 672 plugins_sta="${plugins_sta} ndbcluster partition"
673 plugins_dis="${plugins_dis//partition}"
568 myconf="${myconf} --with-ndb-binlog" 674 myconf="${myconf} --with-ndb-binlog"
675 else
676 plugins_dis="${plugins_dis} ndbcluster"
569 fi 677 fi
570 678
571 if [[ "${PN}" == "mariadb" ]] ; then 679 if [[ "${PN}" == "mariadb" ]] ; then
572 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 680 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
573 # caught above. 681 # caught above.
574 plugins="${plugins},maria,innobase"
575 if use pbxt ; then
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. 682 # This is not optional, without it several upstream testcases fail.
582 # Also strongly recommended by upstream. 683 # Also strongly recommended by upstream.
684 if [[ "${PV}" < "5.2.0" ]] ; then
583 myconf="${myconf} --with-maria-tmp-tables" 685 myconf="${myconf} --with-maria-tmp-tables"
686 plugins_sta="${plugins_sta} maria"
687 else
688 myconf="${myconf} --with-aria-tmp-tables"
689 plugins_sta="${plugins_sta} aria"
584 fi 690 fi
585 691
692 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
693 die "The ${P} package doesn't provide innobase nor xtradb"
694
695 for i in innobase xtradb ; do
696 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
697 done
698
699 myconf="${myconf} $(use_with libevent)"
700
701 if mysql_version_is_at_least "5.2" ; then
702 #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
703 #for i in oqgraph sphinx ; do
704 for i in oqgraph ; do
705 use ${i} \
706 && plugins_dyn="${plugins_dyn} ${i}" \
707 || plugins_dis="${plugins_dis} ${i}"
708 done
709 fi
710 fi
711
712 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
713 use pbxt \
714 && plugins_dyn="${plugins_dyn} pbxt" \
715 || plugins_dis="${plugins_dis} pbxt"
716 fi
717
718 use static && \
719 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
720 plugins_dyn=""
721
722 einfo "Available plugins: ${plugins_avail}"
723 einfo "Dynamic plugins: ${plugins_dyn}"
724 einfo "Static plugins: ${plugins_sta}"
725 einfo "Disabled plugins: ${plugins_dis}"
726
727 # These are the static plugins
586 myconf="${myconf} --with-plugins=${plugins}" 728 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
729 # And the disabled ones
730 for i in ${plugins_dis} ; do
731 myconf="${myconf} --without-plugin-${i}"
732 done
587} 733}
588 734
589pbxt_src_configure() { 735pbxt_src_configure() {
590 mysql_init_vars 736 mysql_init_vars
591 737
592 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 738 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
593 739
594 einfo "Reconfiguring dir '${PWD}'" 740 einfo "Reconfiguring dir '${PWD}'"
595 AT_GNUCONF_UPDATE="yes" eautoreconf 741 eautoreconf
596 742
597 local myconf="" 743 local myconf=""
598 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 744 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
599 use debug && myconf="${myconf} --with-debug=full" 745 use debug && myconf="${myconf} --with-debug=full"
600 econf ${myconf} || die "Problem configuring PBXT storage engine" 746 econf ${myconf} || die "Problem configuring PBXT storage engine"
601} 747}
602 748
603pbxt_src_compile() { 749pbxt_src_compile() {
750
604 # Be backwards compatible for now 751 # Be backwards compatible for now
605 if [[ $EAPI != 2 ]]; then 752 if [[ $EAPI != 2 ]]; then
606 pbxt_src_configure 753 pbxt_src_configure
607 fi 754 fi
608 # TODO: is it safe/needed to use emake here ? 755 # TODO: is it safe/needed to use emake here ?
627# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 774# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
628# check for conflicting use flags 775# check for conflicting use flags
629# create new user and group for mysql 776# create new user and group for mysql
630# warn about deprecated features 777# warn about deprecated features
631mysql_pkg_setup() { 778mysql_pkg_setup() {
632 if hasq test ${FEATURES} ; then 779 if has test ${FEATURES} ; then
633 if ! use minimal ; then 780 if ! use minimal ; then
634 if [[ $UID -eq 0 ]]; then 781 if [[ $UID -eq 0 ]]; then
635 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 782 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
636 fi 783 fi
637 fi 784 fi
638 fi 785 fi
639 786
787 # bug 350844
788 case "${EAPI:-0}" in
789 0 | 1)
790 if use static && !built_with_use sys-libs/ncurses static-libs; then
791 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
792 fi
793 ;;
794 esac
795
640 # Check for USE flag problems in pkg_setup 796 # Check for USE flag problems in pkg_setup
641 if use static && use ssl ; then 797 if use static && use ssl ; then
642 eerror "MySQL does not support being built statically with SSL support enabled!"
643 die "MySQL does not support being built statically with SSL support enabled!" 798 M="MySQL does not support being built statically with SSL support enabled!"
799 eerror "${M}"
800 die "${M}"
801 fi
802
803 if mysql_version_is_at_least "5.1.51" \
804 && ! mysql_version_is_at_least "5.2" \
805 && use debug ; then
806 # Also in package.use.mask
807 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
644 fi 808 fi
645 809
646 if ! mysql_version_is_at_least "5.0" \ 810 if ! mysql_version_is_at_least "5.0" \
647 && use raid \ 811 && use raid \
648 && use static ; then 812 && use static ; then
650 eerror "with RAID support enabled." 814 eerror "with RAID support enabled."
651 die "USE flags 'raid' and 'static' conflict!" 815 die "USE flags 'raid' and 'static' conflict!"
652 fi 816 fi
653 817
654 if mysql_version_is_at_least "4.1.3" \ 818 if mysql_version_is_at_least "4.1.3" \
655 && ( use cluster || use extraengine ) \ 819 && ( use cluster || use extraengine || use embedded ) \
656 && use minimal ; then 820 && use minimal ; then
657 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
658 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 821 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
822 eerror "${M}"
823 die "${M}"
824 fi
825
826 if mysql_version_is_at_least "5.1" \
827 && xtradb_patch_available \
828 && use xtradb \
829 && use embedded ; then
830 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
831 eerror "${M}"
832 die "${M}"
659 fi 833 fi
660 834
661 # Bug #290570, 284946, 307251 835 # Bug #290570, 284946, 307251
662 # Upstream changes made us need a fairly new GCC4. 836 # Upstream changes made us need a fairly new GCC4.
663 # But only for 5.0.8[3-6]! 837 # 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 838 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
665 GCC_VER=$(gcc-version) 839 GCC_VER=$(gcc-version)
666 case ${GCC_VER} in 840 case ${GCC_VER} in
667 2*|3*|4.0|4.1|4.2) 841 2*|3*|4.0|4.1|4.2)
668 eerror "Some releases of MySQL required a very new GCC, and then" 842 eerror "Some releases of MySQL required a very new GCC, and then"
669 eerror "later release relaxed that requirement again. Either pick a" 843 eerror "later release relaxed that requirement again. Either pick a"
670 eerror "MySQL >=5.0.87, or use a newer GCC." 844 eerror "MySQL >=5.0.87, or use a newer GCC."
671 die "Active GCC too old!" ;; 845 die "Active GCC too old!" ;;
672 esac 846 esac
726 mysql_mv_patches 900 mysql_mv_patches
727 # And apply 901 # And apply
728 epatch 902 epatch
729 903
730 # last -fPIC fixup, per bug #305873 904 # last -fPIC fixup, per bug #305873
731 i="${S}"/storage/innodb_plugin/plug.in 905 i="${S}"/storage/innodb_plugin/plug.in
732 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 906 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
733 907
734 # Additional checks, remove bundled zlib 908 # Additional checks, remove bundled zlib (Cluster needs this, for static
909 # memory management in zlib, leave available for Cluster)
910 if [[ "${PN}" != "mysql-cluster" ]] ; then
735 rm -f "${S}/zlib/"*.[ch] 911 rm -f "${S}/zlib/"*.[ch]
736 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 912 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
913 fi
737 rm -f "scripts/mysqlbug" 914 rm -f "scripts/mysqlbug"
738 915
739 # Make charsets install in the right place 916 # Make charsets install in the right place
740 find . -name 'Makefile.am' \ 917 find . -name 'Makefile.am' \
741 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 918 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
752 fi 929 fi
753 930
754 local rebuilddirlist d 931 local rebuilddirlist d
755 932
756 if xtradb_patch_available && use xtradb ; then 933 if xtradb_patch_available && use xtradb ; then
757 einfo "Replacing InnoDB with Percona XtraDB" 934 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
758 pushd "${S}"/storage 935 pushd "${S}"/storage >/dev/null
759 i="innobase" 936 i="innobase"
760 o="${WORKDIR}/storage-${i}.mysql-upstream" 937 o="${WORKDIR}/storage-${i}.mysql-upstream"
761 # Have we been here already? 938 # Have we been here already?
762 [ -d "${o}" ] && rm -f "${i}" 939 [ -d "${o}" ] && rm -f "${i}"
763 # Or maybe we haven't 940 # Or maybe we haven't
764 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 941 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
765 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 942 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
766 popd 943 popd >/dev/null
944 fi
945
946 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
947 einfo "Adding storage engine: PBXT"
948 pushd "${S}"/storage >/dev/null
949 i='pbxt'
950 [ -d "${i}" ] && rm -rf "${i}"
951 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
952 popd >/dev/null
767 fi 953 fi
768 954
769 if mysql_version_is_at_least "5.1.12" ; then 955 if mysql_version_is_at_least "5.1.12" ; then
770 rebuilddirlist="." 956 rebuilddirlist="."
771 # This does not seem to be needed presently. robbat2 2010/02/23 957 # This does not seem to be needed presently. robbat2 2010/02/23
780 fi 966 fi
781 967
782 for d in ${rebuilddirlist} ; do 968 for d in ${rebuilddirlist} ; do
783 einfo "Reconfiguring dir '${d}'" 969 einfo "Reconfiguring dir '${d}'"
784 pushd "${d}" &>/dev/null 970 pushd "${d}" &>/dev/null
785 AT_GNUCONF_UPDATE="yes" eautoreconf 971 eautoreconf
786 popd &>/dev/null 972 popd &>/dev/null
787 done 973 done
788 974
789 if mysql_check_version_range "4.1 to 5.0.99.99" \ 975 if mysql_check_version_range "4.1 to 5.0.99.99" \
790 && use berkdb ; then 976 && use berkdb ; then
846 export CXXFLAGS 1032 export CXXFLAGS
847 1033
848 # bug #283926, with GCC4.4, this is required to get correct behavior. 1034 # bug #283926, with GCC4.4, this is required to get correct behavior.
849 append-flags -fno-strict-aliasing 1035 append-flags -fno-strict-aliasing
850 1036
1037 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
1038 # causes a mis-compile.
1039 # Upstream bugs:
1040 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
1041 # http://bugs.mysql.com/bug.php?id=45205
1042 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1043 append-flags -fno-omit-frame-pointer && \
1044 filter-flags -fomit-frame-pointer
1045
851 econf \ 1046 econf \
852 --libexecdir="/usr/sbin" \ 1047 --libexecdir="/usr/sbin" \
853 --sysconfdir="${MY_SYSCONFDIR}" \ 1048 --sysconfdir="${MY_SYSCONFDIR}" \
854 --localstatedir="${MY_LOCALSTATEDIR}" \ 1049 --localstatedir="${MY_LOCALSTATEDIR}" \
855 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1050 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
858 --with-low-memory \ 1053 --with-low-memory \
859 --with-client-ldflags=-lstdc++ \ 1054 --with-client-ldflags=-lstdc++ \
860 --enable-thread-safe-client \ 1055 --enable-thread-safe-client \
861 --with-comment="Gentoo Linux ${PF}" \ 1056 --with-comment="Gentoo Linux ${PF}" \
862 --without-docs \ 1057 --without-docs \
1058 --with-LIBDIR="$(get_libdir)" \
863 ${myconf} || die "econf failed" 1059 ${myconf} || die "econf failed"
864 1060
865 # TODO: Move this before autoreconf !!! 1061 # TODO: Move this before autoreconf !!!
866 find . -type f -name Makefile -print0 \ 1062 find . -type f -name Makefile -print0 \
867 | xargs -0 -n100 sed -i \ 1063 | xargs -0 -n100 sed -i \
868 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1064 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
869 1065
870 if [[ $EAPI == 2 ]]; then 1066 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
871 pbxt_patch_available && use pbxt && pbxt_src_configure 1067 pbxt_patch_available && use pbxt && pbxt_src_configure
872 fi 1068 fi
873} 1069}
874 1070
875# @FUNCTION: mysql_src_compile 1071# @FUNCTION: mysql_src_compile
882 0 | 1) mysql_src_configure ;; 1078 0 | 1) mysql_src_configure ;;
883 esac 1079 esac
884 1080
885 emake || die "emake failed" 1081 emake || die "emake failed"
886 1082
1083 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
887 pbxt_patch_available && use pbxt && pbxt_src_compile 1084 pbxt_patch_available && use pbxt && pbxt_src_compile
1085 fi
888} 1086}
889 1087
890# @FUNCTION: mysql_src_install 1088# @FUNCTION: mysql_src_install
891# @DESCRIPTION: 1089# @DESCRIPTION:
892# Install mysql. 1090# Install mysql.
898 DESTDIR="${D}" \ 1096 DESTDIR="${D}" \
899 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1097 benchdir_root="${MY_SHAREDSTATEDIR}" \
900 testroot="${MY_SHAREDSTATEDIR}" \ 1098 testroot="${MY_SHAREDSTATEDIR}" \
901 || die "emake install failed" 1099 || die "emake install failed"
902 1100
1101 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
903 pbxt_patch_available && use pbxt && pbxt_src_install 1102 pbxt_patch_available && use pbxt && pbxt_src_install
1103 fi
904 1104
905 # Convenience links 1105 # Convenience links
906 einfo "Making Convenience links for mysqlcheck multi-call binary" 1106 einfo "Making Convenience links for mysqlcheck multi-call binary"
907 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1107 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
908 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1108 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
932 if use !test ; then 1132 if use !test ; then
933 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1133 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
934 fi 1134 fi
935 1135
936 # Configuration stuff 1136 # Configuration stuff
937 if mysql_version_is_at_least "5.1" ; then 1137 case ${MYSQL_PV_MAJOR} in
938 mysql_mycnf_version="5.1"
939 elif mysql_version_is_at_least "4.1" ; then
940 mysql_mycnf_version="4.1"
941 else
942 mysql_mycnf_version="4.0" 1138 3*|4.0) mysql_mycnf_version="4.0" ;;
943 fi 1139 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
944 einfo "Building default my.cnf" 1140 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1141 esac
1142 einfo "Building default my.cnf (${mysql_mycnf_version})"
945 insinto "${MY_SYSCONFDIR}" 1143 insinto "${MY_SYSCONFDIR}"
946 doins scripts/mysqlaccess.conf 1144 doins scripts/mysqlaccess.conf
1145 mycnf_src="my.cnf-${mysql_mycnf_version}"
947 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1146 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
948 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1147 "${FILESDIR}/${mycnf_src}" \
949 > "${TMPDIR}/my.cnf.ok" 1148 > "${TMPDIR}/my.cnf.ok"
950 if mysql_version_is_at_least "4.1" && use latin1 ; then 1149 if use latin1 ; then
951 sed -i \ 1150 sed -i \
952 -e "/character-set/s|utf8|latin1|g" \ 1151 -e "/character-set/s|utf8|latin1|g" \
953 "${TMPDIR}/my.cnf.ok" 1152 "${TMPDIR}/my.cnf.ok"
954 fi 1153 fi
955 newins "${TMPDIR}/my.cnf.ok" my.cnf 1154 newins "${TMPDIR}/my.cnf.ok" my.cnf
973 done 1172 done
974 fi 1173 fi
975 1174
976 # Docs 1175 # Docs
977 einfo "Installing docs" 1176 einfo "Installing docs"
978 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1177 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
1178 [[ -f "$i" ]] && dodoc "$i"
1179 done
979 doinfo "${S}"/Docs/mysql.info 1180 doinfo "${S}"/Docs/mysql.info
980 1181
981 # Minimal builds don't have the MySQL server 1182 # Minimal builds don't have the MySQL server
982 if ! use minimal ; then 1183 if ! use minimal ; then
983 einfo "Including support files and sample configurations" 1184 einfo "Including support files and sample configurations"
1049 1250
1050 einfo 1251 einfo
1051 elog "You might want to run:" 1252 elog "You might want to run:"
1052 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1253 elog "\"emerge --config =${CATEGORY}/${PF}\""
1053 elog "if this is a new install." 1254 elog "if this is a new install."
1255 einfo
1256
1257 einfo
1258 elog "If you are upgrading major versions, you should run the"
1259 elog "mysql_upgrade tool."
1054 einfo 1260 einfo
1055 fi 1261 fi
1056 1262
1057 if pbxt_available && use pbxt ; then 1263 if pbxt_available && use pbxt ; then
1058 # TODO: explain it better 1264 # TODO: explain it better
1113 fi 1319 fi
1114 fi 1320 fi
1115 1321
1116 local pwd1="a" 1322 local pwd1="a"
1117 local pwd2="b" 1323 local pwd2="b"
1118 local MYSQL_ROOT_PASSWORD=''
1119 local maxtry=15 1324 local maxtry=15
1120 1325
1121 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1326 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")" 1327 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1123 fi 1328 fi
1133 # localhost. Also causes weird failures. 1338 # localhost. Also causes weird failures.
1134 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1339 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1135 1340
1136 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then 1341 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1137 1342
1138 einfo "Please provide a password for the mysql 'root' user now," 1343 einfo "Please provide a password for the mysql 'root' user now, in the"
1139 einfo "or in the MYSQL_ROOT_PASSWORD env var." 1344 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1140 ewarn "Avoid [\"'\\_%] characters in the password" 1345 ewarn "Avoid [\"'\\_%] characters in the password"
1141 read -rsp " >" pwd1 ; echo 1346 read -rsp " >" pwd1 ; echo
1142 1347
1143 einfo "Retype the password" 1348 einfo "Retype the password"
1144 read -rsp " >" pwd2 ; echo 1349 read -rsp " >" pwd2 ; echo
1174 # Figure out which options we need to disable to do the setup 1379 # Figure out which options we need to disable to do the setup
1175 helpfile="${TMPDIR}/mysqld-help" 1380 helpfile="${TMPDIR}/mysqld-help"
1176 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null 1381 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1177 for opt in grant-tables host-cache name-resolve networking slave-start bdb \ 1382 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 \ 1383 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1384 ndbcluster \
1179 ; do 1385 ; do
1180 optexp="--(skip-)?${opt}" optfull="--skip-${opt}" 1386 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1181 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" 1387 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1182 done 1388 done
1183 # But some options changed names 1389 # But some options changed names
1191 1397
1192 if [[ -r "${help_tables}" ]] ; then 1398 if [[ -r "${help_tables}" ]] ; then
1193 cat "${help_tables}" >> "${sqltmp}" 1399 cat "${help_tables}" >> "${sqltmp}"
1194 fi 1400 fi
1195 fi 1401 fi
1196 1402
1197 einfo "Creating the mysql database and setting proper" 1403 einfo "Creating the mysql database and setting proper"
1198 einfo "permissions on it ..." 1404 einfo "permissions on it ..."
1199 1405
1200 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1406 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1201 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1407 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"

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

  ViewVC Help
Powered by ViewVC 1.1.20