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

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

  ViewVC Help
Powered by ViewVC 1.1.20