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

Diff of /eclass/mysql.eclass

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

Revision 1.148 Revision 1.176
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2012 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.148 2010/08/09 19:29:49 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.176 2012/11/01 20:22:57 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
9# - Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org> 9# Robin H. Johnson <robbat2@gentoo.org>
10# @AUTHOR:
11# Francesco Riosa (Retired) <vivo@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds 12# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION: 13# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds 14# The mysql.eclass provides almost all the code to build the mysql ebuilds
14# including the src_unpack, src_prepare, src_configure, src_compile, 15# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm 16# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks. 17# phase hooks.
17 18
18WANT_AUTOCONF="latest" 19WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 20WANT_AUTOMAKE="latest"
20 21
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs 22inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
22 23
23# Shorten the path because the socket path length must be shorter than 107 chars 24# 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 25# and we will run a mysql server during test phase
25S="${WORKDIR}/mysql" 26S="${WORKDIR}/mysql"
26 27
27[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" 28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
28if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
29 EGIT_PROJECT=mysql-extras 30 EGIT_PROJECT=mysql-extras
30 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
31 inherit git 32 inherit git-2
32fi 33fi
33 34
34case "${EAPI:-0}" in 35case "${EAPI:-0}" in
35 2) 36 2|3|4|5)
36 EXPORT_FUNCTIONS pkg_setup \ 37 EXPORT_FUNCTIONS pkg_setup \
37 src_unpack src_prepare \ 38 src_unpack src_prepare \
38 src_configure src_compile \ 39 src_configure src_compile \
39 src_install \ 40 src_install \
40 pkg_preinst pkg_postinst \ 41 pkg_preinst pkg_postinst \
59# Upstream MySQL considers the first two parts of the version number to be the 60# 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# major version. Upgrades that change major version should always run
61# mysql_upgrade. 62# mysql_upgrade.
62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" 63MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
63 64
65# Cluster is a special case...
66if [[ "${PN}" == "mysql-cluster" ]]; then
67 case $PV in
68 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
69 esac
70fi
71
72
64# @ECLASS-VARIABLE: MYSQL_VERSION_ID 73# @ECLASS-VARIABLE: MYSQL_VERSION_ID
65# @DESCRIPTION: 74# @DESCRIPTION:
66# MYSQL_VERSION_ID will be: 75# MYSQL_VERSION_ID will be:
67# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 76# 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 77# This is an important part, because many of the choices the MySQL ebuild will do
95 MYSQL_COMMUNITY_FEATURES=1 104 MYSQL_COMMUNITY_FEATURES=1
96elif [ "${PV#5.4}" != "${PV}" ] ; then 105elif [ "${PV#5.4}" != "${PV}" ] ; then
97 MYSQL_COMMUNITY_FEATURES=1 106 MYSQL_COMMUNITY_FEATURES=1
98elif [ "${PV#5.5}" != "${PV}" ] ; then 107elif [ "${PV#5.5}" != "${PV}" ] ; then
99 MYSQL_COMMUNITY_FEATURES=1 108 MYSQL_COMMUNITY_FEATURES=1
100elif [ "${PV#6.0}" != "${PV}" ] ; then 109elif [ "${PV#6}" != "${PV}" ] ; then
110 MYSQL_COMMUNITY_FEATURES=1
111elif [ "${PV#7}" != "${PV}" ] ; then
101 MYSQL_COMMUNITY_FEATURES=1 112 MYSQL_COMMUNITY_FEATURES=1
102else 113else
103 MYSQL_COMMUNITY_FEATURES=0 114 MYSQL_COMMUNITY_FEATURES=0
104fi 115fi
105 116
114PERCONA_VER="${PERCONA_VER}" 125PERCONA_VER="${PERCONA_VER}"
115 126
116# Be warned, *DEPEND are version-dependant 127# Be warned, *DEPEND are version-dependant
117# These are used for both runtime and compiletime 128# These are used for both runtime and compiletime
118DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 129DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
119 userland_GNU? ( sys-process/procps ) 130 kernel_linux? ( sys-process/procps )
120 >=sys-apps/sed-4 131 >=sys-apps/sed-4
121 >=sys-apps/texinfo-4.7-r1 132 >=sys-apps/texinfo-4.7-r1
122 >=sys-libs/readline-4.1 133 >=sys-libs/readline-4.1
123 >=sys-libs/zlib-1.2.3" 134 >=sys-libs/zlib-1.2.3"
124 135
125[[ "${PN}" == "mariadb" ]] \ 136[[ "${PN}" == "mariadb" ]] \
126&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" 137&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
127 138
128# Having different flavours at the same time is not a good idea 139# Having different flavours at the same time is not a good idea
129for i in "mysql" "mysql-community" "mariadb" ; do 140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
130 [[ "${i}" == ${PN} ]] || 141 [[ "${i}" == ${PN} ]] ||
131 DEPEND="${DEPEND} !dev-db/${i}" 142 DEPEND="${DEPEND} !dev-db/${i}"
132done 143done
133 144
145# prefix: first need to implement something for #196294
134RDEPEND="${DEPEND} 146RDEPEND="${DEPEND}
135 !minimal? ( dev-db/mysql-init-scripts ) 147 !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
136 selinux? ( sec-policy/selinux-mysql )" 148 selinux? ( sec-policy/selinux-mysql )"
149
150DEPEND="${DEPEND}
151 virtual/yacc"
152
153if [ "${EAPI:-0}" = "2" ]; then
154 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
155fi
137 156
138# compile-time-only 157# compile-time-only
139mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
140|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
141 160
142# compile-time-only 161# compile-time-only
143mysql_version_is_at_least "5.1.12" \ 162mysql_version_is_at_least "5.1.12" \
144&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 163&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
164
165[[ "${PN}" == "mariadb" ]] \
166&& mysql_version_is_at_least "5.2" \
167&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
168#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
169# sphinx? ( app-misc/sphinx )"
145 170
146# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 171# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
147PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 172PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
148 173
149# For other stuff to bring us in 174# For other stuff to bring us in
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 179 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 180 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 181 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
157 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" 182 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
158 SERVER_URI=" 183 SERVER_URI="
184 http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
159 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz 185 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
160 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz 186 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
161 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz 187 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
188 http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
189 http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
162 " 190 "
163 # The community build is on the mirrors 191 # The community and cluster builds are on the mirrors
164 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 192 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
165 if [[ "${PN}" == "mysql-cluster" ]] ; then 193 if [[ "${PN}" == "mysql-cluster" ]] ; then
166 URI_DIR="MySQL-Cluster" 194 URI_DIR="MySQL-Cluster"
167 URI_FILE="mysql-cluster-gpl" 195 URI_FILE="mysql-cluster-gpl"
168 else 196 else
169 URI_DIR="MySQL" 197 URI_DIR="MySQL"
204IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test" 232IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
205 233
206mysql_version_is_at_least "4.1" \ 234mysql_version_is_at_least "4.1" \
207&& IUSE="${IUSE} latin1" 235&& IUSE="${IUSE} latin1"
208 236
209mysql_version_is_at_least "4.1.3" \ 237if mysql_version_is_at_least "4.1.3" ; then
210&& IUSE="${IUSE} cluster extraengine" 238 IUSE="${IUSE} extraengine"
239 if [[ "${PN}" != "mysql-cluster" ]] ; then
240 IUSE="${IUSE} cluster"
241 fi
242fi
211 243
212mysql_version_is_at_least "5.0" \ 244mysql_version_is_at_least "5.0" \
213|| IUSE="${IUSE} raid" 245|| IUSE="${IUSE} raid"
214 246
215mysql_version_is_at_least "5.0.18" \ 247mysql_version_is_at_least "5.0.18" \
221[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 253[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
222&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 254&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
223 255
224[[ "${PN}" == "mariadb" ]] \ 256[[ "${PN}" == "mariadb" ]] \
225&& IUSE="${IUSE} libevent" 257&& IUSE="${IUSE} libevent"
258
259[[ "${PN}" == "mariadb" ]] \
260&& mysql_version_is_at_least "5.2" \
261&& IUSE="${IUSE} oqgraph"
262#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
263#&& IUSE="${IUSE} oqgraph sphinx"
226 264
227# MariaDB has integrated PBXT 265# MariaDB has integrated PBXT
228# PBXT_VERSION means that we have a PBXT patch for this PV 266# PBXT_VERSION means that we have a PBXT patch for this PV
229# PBXT was only introduced after 5.1.12 267# PBXT was only introduced after 5.1.12
230pbxt_patch_available() { 268pbxt_patch_available() {
284mysql_disable_test() { 322mysql_disable_test() {
285 local rawtestname testname testsuite reason mysql_disable_file 323 local rawtestname testname testsuite reason mysql_disable_file
286 rawtestname="${1}" ; shift 324 rawtestname="${1}" ; shift
287 reason="${@}" 325 reason="${@}"
288 ewarn "test '${rawtestname}' disabled: '${reason}'" 326 ewarn "test '${rawtestname}' disabled: '${reason}'"
289 327
290 testsuite="${rawtestname/.*}" 328 testsuite="${rawtestname/.*}"
291 testname="${rawtestname/*.}" 329 testname="${rawtestname/*.}"
292 mysql_disable_file="${S}/mysql-test/t/disabled.def" 330 mysql_disable_file="${S}/mysql-test/t/disabled.def"
293 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 331 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
294 echo ${testname} : ${reason} >> "${mysql_disable_file}" 332 echo ${testname} : ${reason} >> "${mysql_disable_file}"
324# @DESCRIPTION: 362# @DESCRIPTION:
325# void mysql_init_vars() 363# void mysql_init_vars()
326# Initialize global variables 364# Initialize global variables
327# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
328mysql_init_vars() { 366mysql_init_vars() {
329 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
330 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
331 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
332 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
333 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
334 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
335 373
336 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
337 MY_DATADIR="" 375 MY_DATADIR=""
338 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
339 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
340 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
341 | tail -n1` 379 | tail -n1`
342 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
343 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
344 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
345 | tail -n1` 383 | tail -n1`
346 fi 384 fi
347 fi 385 fi
348 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
420 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
421 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
422 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
423 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
424 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
425 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
426 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
427 465
428 if use static ; then 466 if use static ; then
429 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
430 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
436 if use debug ; then 474 if use debug ; then
437 myconf="${myconf} --with-debug=full" 475 myconf="${myconf} --with-debug=full"
438 else 476 else
439 myconf="${myconf} --without-debug" 477 myconf="${myconf} --without-debug"
440 mysql_version_is_at_least "4.1.3" \ 478 mysql_version_is_at_least "4.1.3" \
441 && use cluster \ 479 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
442 && myconf="${myconf} --without-ndb-debug" 480 && myconf="${myconf} --without-ndb-debug"
443 fi 481 fi
444 482
445 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 483 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
446 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 484 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
465 fi 503 fi
466 504
467} 505}
468 506
469configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
470 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
471 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
472 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
473 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
474 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
475 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
476 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 515 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
477 516
478 # --with-vio is not needed anymore, it's on by default and 517 # --with-vio is not needed anymore, it's on by default and
479 # has been removed from configure 518 # has been removed from configure
480 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
503 myconf="${myconf} --without-berkeley-db" 542 myconf="${myconf} --without-berkeley-db"
504 fi 543 fi
505 544
506 if mysql_version_is_at_least "4.1.3" ; then 545 if mysql_version_is_at_least "4.1.3" ; then
507 myconf="${myconf} --with-geometry" 546 myconf="${myconf} --with-geometry"
547 if [[ "${PN}" != "mysql-cluster" ]] ; then
508 myconf="${myconf} $(use_with cluster ndbcluster)" 548 myconf="${myconf} $(use_with cluster ndbcluster)"
549 fi
509 fi 550 fi
510 551
511 if mysql_version_is_at_least "4.1.3" && use extraengine ; then 552 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
512 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 553 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
513 myconf="${myconf} --with-archive-storage-engine" 554 myconf="${myconf} --with-archive-storage-engine"
544 585
545configure_51() { 586configure_51() {
546 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
547 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
548 # readline.h instead of history.h 589 # readline.h instead of history.h
549 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
550 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
551 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
552 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
553 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
554 myconf="${myconf} --without-pstack" 595 myconf="${myconf} --without-pstack"
555 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" 596 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
556 597
598 # This is an explict die here, because if we just forcibly disable it, then the
599 # user's data is not accessible.
600 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
557 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
558 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 602 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
559 myconf="${myconf} $(use_enable community community-features)" 603 myconf="${myconf} $(use_enable community community-features)"
560 if use community; then 604 if use community; then
561 myconf="${myconf} $(use_enable profiling)" 605 myconf="${myconf} $(use_enable profiling)"
562 else 606 else
575 \) \ 619 \) \
576 -print0 \ 620 -print0 \
577 | xargs -0 sed -r -n \ 621 | xargs -0 sed -r -n \
578 -e '/^MYSQL_STORAGE_ENGINE/{ 622 -e '/^MYSQL_STORAGE_ENGINE/{
579 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ; 623 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
580 s~^([^ ]+).*~\1~gp; 624 s~^([^ ]+).*~\1~gp;
581 }' \ 625 }' \
582 | tr -s '\n' ' ' 626 | tr -s '\n' ' '
583 )" 627 )"
584 628
585 # 5.1 introduces a new way to manage storage engines (plugins) 629 # 5.1 introduces a new way to manage storage engines (plugins)
598 fi 642 fi
599 # Now the extras 643 # Now the extras
600 if use extraengine ; then 644 if use extraengine ; then
601 # like configuration=max-no-ndb, archive and example removed in 5.1.11 645 # like configuration=max-no-ndb, archive and example removed in 5.1.11
602 # not added yet: ibmdb2i 646 # not added yet: ibmdb2i
603 # Not supporting as examples: example,daemon_example,ftexample 647 # Not supporting as examples: example,daemon_example,ftexample
604 plugins_sta="${plugins_sta} partition" 648 plugins_sta="${plugins_sta} partition"
605 plugins_dyn="${plugins_sta} federated"
606 649
607 if [[ "${PN}" != "mariadb" ]] ; then 650 if [[ "${PN}" != "mariadb" ]] ; then
608 elog "Before using the Federated storage engine, please be sure to read" 651 elog "Before using the Federated storage engine, please be sure to read"
609 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 652 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
653 plugins_dyn="${plugins_sta} federated"
610 else 654 else
611 elog "MariaDB includes the FederatedX engine. Be sure to read" 655 elog "MariaDB includes the FederatedX engine. Be sure to read"
612 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 656 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
657 plugins_dyn="${plugins_sta} federatedx"
613 fi 658 fi
614 else 659 else
615 plugins_dis="${plugins_dis} partition federated" 660 plugins_dis="${plugins_dis} partition federated"
616 fi 661 fi
617 662
624 for i in innodb_plugin ; do 669 for i in innodb_plugin ; do
625 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}" 670 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
626 done 671 done
627 672
628 # like configuration=max-no-ndb 673 # like configuration=max-no-ndb
629 if use cluster ; then 674 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
630 plugins_sta="${plugins_sta} ndbcluster partition" 675 plugins_sta="${plugins_sta} ndbcluster partition"
631 plugins_dis="${plugins_dis//partition}" 676 plugins_dis="${plugins_dis//partition}"
632 myconf="${myconf} --with-ndb-binlog" 677 myconf="${myconf} --with-ndb-binlog"
633 else 678 else
634 plugins_dis="${plugins_dis} ndbcluster" 679 plugins_dis="${plugins_dis} ndbcluster"
635 fi 680 fi
636 681
637 if [[ "${PN}" == "mariadb" ]] ; then 682 if [[ "${PN}" == "mariadb" ]] ; then
638 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 683 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
639 # caught above. 684 # caught above.
640 plugins_sta="${plugins_sta} maria innobase"
641 myconf="${myconf} $(use_with libevent)"
642 # This is not optional, without it several upstream testcases fail. 685 # This is not optional, without it several upstream testcases fail.
643 # Also strongly recommended by upstream. 686 # Also strongly recommended by upstream.
687 if [[ "${PV}" < "5.2.0" ]] ; then
644 myconf="${myconf} --with-maria-tmp-tables" 688 myconf="${myconf} --with-maria-tmp-tables"
689 plugins_sta="${plugins_sta} maria"
690 else
691 myconf="${myconf} --with-aria-tmp-tables"
692 plugins_sta="${plugins_sta} aria"
645 fi 693 fi
646 694
695 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
696 die "The ${P} package doesn't provide innobase nor xtradb"
697
698 for i in innobase xtradb ; do
699 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
700 done
701
702 myconf="${myconf} $(use_with libevent)"
703
704 if mysql_version_is_at_least "5.2" ; then
705 #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
706 #for i in oqgraph sphinx ; do
707 for i in oqgraph ; do
708 use ${i} \
709 && plugins_dyn="${plugins_dyn} ${i}" \
710 || plugins_dis="${plugins_dis} ${i}"
711 done
712 fi
713 fi
714
647 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then 715 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
648 use pbxt \ 716 use pbxt \
649 && plugins_dyn="${plugins_dyn} pbxt" \ 717 && plugins_sta="${plugins_sta} pbxt" \
650 || plugins_dis="${plugins_dis} pbxt" 718 || plugins_dis="${plugins_dis} pbxt"
651 fi 719 fi
652 720
653 use static && \ 721 use static && \
654 plugins_sta="${plugins_sta} ${plugins_dyn}" && \ 722 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
655 plugins_dyn="" 723 plugins_dyn=""
656 724
657 einfo "Available plugins: ${plugins_avail}" 725 einfo "Available plugins: ${plugins_avail}"
658 einfo "Dynamic plugins: ${plugins_dyn}" 726 einfo "Dynamic plugins: ${plugins_dyn}"
659 einfo "Static plugins: ${plugins_sta}" 727 einfo "Static plugins: ${plugins_sta}"
660 einfo "Disabled plugins: ${plugins_dis}" 728 einfo "Disabled plugins: ${plugins_dis}"
661 729
671 mysql_init_vars 739 mysql_init_vars
672 740
673 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 741 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
674 742
675 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
676 AT_GNUCONF_UPDATE="yes" eautoreconf 744 eautoreconf
677 745
678 local myconf="" 746 local myconf=""
679 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
680 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
681 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
682} 750}
683 751
684pbxt_src_compile() { 752pbxt_src_compile() {
709# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 777# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
710# check for conflicting use flags 778# check for conflicting use flags
711# create new user and group for mysql 779# create new user and group for mysql
712# warn about deprecated features 780# warn about deprecated features
713mysql_pkg_setup() { 781mysql_pkg_setup() {
714 if hasq test ${FEATURES} ; then 782 if has test ${FEATURES} ; then
715 if ! use minimal ; then 783 if ! use minimal ; then
716 if [[ $UID -eq 0 ]]; then 784 if [[ $UID -eq 0 ]]; then
717 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 785 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
718 fi 786 fi
719 fi 787 fi
720 fi 788 fi
789
790 # bug 350844
791 case "${EAPI:-0}" in
792 0 | 1)
793 if use static && ! built_with_use sys-libs/ncurses static-libs; then
794 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
795 fi
796 ;;
797 esac
721 798
722 # Check for USE flag problems in pkg_setup 799 # Check for USE flag problems in pkg_setup
723 if use static && use ssl ; then 800 if use static && use ssl ; then
724 M="MySQL does not support being built statically with SSL support enabled!" 801 M="MySQL does not support being built statically with SSL support enabled!"
725 eerror "${M}" 802 eerror "${M}"
726 die "${M}" 803 die "${M}"
804 fi
805
806 if mysql_version_is_at_least "5.1.51" \
807 && ! mysql_version_is_at_least "5.2" \
808 && use debug ; then
809 # Also in package.use.mask
810 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
727 fi 811 fi
728 812
729 if ! mysql_version_is_at_least "5.0" \ 813 if ! mysql_version_is_at_least "5.0" \
730 && use raid \ 814 && use raid \
731 && use static ; then 815 && use static ; then
739 && use minimal ; then 823 && use minimal ; then
740 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!" 824 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
741 eerror "${M}" 825 eerror "${M}"
742 die "${M}" 826 die "${M}"
743 fi 827 fi
744 828
745 if mysql_version_is_at_least "5.1" \ 829 if mysql_version_is_at_least "5.1" \
746 && xtradb_patch_available \ 830 && xtradb_patch_available \
747 && use xtradb \ 831 && use xtradb \
748 && use embedded ; then 832 && use embedded ; then
749 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures" 833 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
754 # Bug #290570, 284946, 307251 838 # Bug #290570, 284946, 307251
755 # Upstream changes made us need a fairly new GCC4. 839 # Upstream changes made us need a fairly new GCC4.
756 # But only for 5.0.8[3-6]! 840 # But only for 5.0.8[3-6]!
757 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then 841 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
758 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
759 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
844 *-darwin*:4.*) : ;; # bug #310615
760 2*|3*|4.0|4.1|4.2) 845 *:2*|*:3*|*:4.0|*:4.1|*:4.2)
761 eerror "Some releases of MySQL required a very new GCC, and then" 846 eerror "Some releases of MySQL required a very new GCC, and then"
762 eerror "later release relaxed that requirement again. Either pick a" 847 eerror "later release relaxed that requirement again. Either pick a"
763 eerror "MySQL >=5.0.87, or use a newer GCC." 848 eerror "MySQL >=5.0.87, or use a newer GCC."
764 die "Active GCC too old!" ;; 849 die "Active GCC too old!" ;;
765 esac 850 esac
819 mysql_mv_patches 904 mysql_mv_patches
820 # And apply 905 # And apply
821 epatch 906 epatch
822 907
823 # last -fPIC fixup, per bug #305873 908 # last -fPIC fixup, per bug #305873
824 i="${S}"/storage/innodb_plugin/plug.in 909 i="${S}"/storage/innodb_plugin/plug.in
825 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 910 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
826 911
827 # Additional checks, remove bundled zlib 912 # Additional checks, remove bundled zlib (Cluster needs this, for static
913 # memory management in zlib, leave available for Cluster)
914 if [[ "${PN}" != "mysql-cluster" ]] ; then
828 rm -f "${S}/zlib/"*.[ch] 915 rm -f "${S}/zlib/"*.[ch]
829 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 916 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
917 fi
830 rm -f "scripts/mysqlbug" 918 rm -f "scripts/mysqlbug"
831 919
832 # Make charsets install in the right place 920 # Make charsets install in the right place
833 find . -name 'Makefile.am' \ 921 find . -name 'Makefile.am' \
834 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 922 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
856 # Or maybe we haven't 944 # Or maybe we haven't
857 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 945 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
858 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}" 946 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
859 popd >/dev/null 947 popd >/dev/null
860 fi 948 fi
861 949
862 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then 950 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
863 einfo "Adding storage engine: PBXT" 951 einfo "Adding storage engine: PBXT"
864 pushd "${S}"/storage >/dev/null 952 pushd "${S}"/storage >/dev/null
865 i='pbxt' 953 i='pbxt'
866 [ -d "${i}" ] && rm -rf "${i}" 954 [ -d "${i}" ] && rm -rf "${i}"
867 cp -ral "${WORKDIR}/${PBXT_P}" "${i}" 955 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
882 fi 970 fi
883 971
884 for d in ${rebuilddirlist} ; do 972 for d in ${rebuilddirlist} ; do
885 einfo "Reconfiguring dir '${d}'" 973 einfo "Reconfiguring dir '${d}'"
886 pushd "${d}" &>/dev/null 974 pushd "${d}" &>/dev/null
887 AT_GNUCONF_UPDATE="yes" eautoreconf 975 eautoreconf
888 popd &>/dev/null 976 popd &>/dev/null
889 done 977 done
890 978
891 if mysql_check_version_range "4.1 to 5.0.99.99" \ 979 if mysql_check_version_range "4.1 to 5.0.99.99" \
892 && use berkdb ; then 980 && use berkdb ; then
893 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
894 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 982 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
895 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 983 cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
896 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
897 #These files exist only with libtool-2*, and need to be included. 985 #These files exist only with libtool-2*, and need to be included.
898 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
899 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
900 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
901 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" 989 cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
902 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
903 fi 991 fi
904 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
905 sh s_all \ 993 sh s_all \
906 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
907 popd &>/dev/null 995 popd &>/dev/null
948 export CXXFLAGS 1036 export CXXFLAGS
949 1037
950 # bug #283926, with GCC4.4, this is required to get correct behavior. 1038 # bug #283926, with GCC4.4, this is required to get correct behavior.
951 append-flags -fno-strict-aliasing 1039 append-flags -fno-strict-aliasing
952 1040
1041 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
1042 # causes a mis-compile.
1043 # Upstream bugs:
1044 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
1045 # http://bugs.mysql.com/bug.php?id=45205
1046 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1047 append-flags -fno-omit-frame-pointer && \
1048 filter-flags -fomit-frame-pointer
1049
953 econf \ 1050 econf \
954 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
955 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
956 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
957 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
958 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
959 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
960 --with-low-memory \ 1057 --with-low-memory \
961 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
962 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
963 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
964 --without-docs \ 1061 --without-docs \
1062 --with-LIBDIR="$(get_libdir)" \
965 ${myconf} || die "econf failed" 1063 ${myconf} || die "econf failed"
966 1064
967 # TODO: Move this before autoreconf !!! 1065 # TODO: Move this before autoreconf !!!
968 find . -type f -name Makefile -print0 \ 1066 find . -type f -name Makefile -print0 \
969 | xargs -0 -n100 sed -i \ 1067 | xargs -0 -n100 sed -i \
998 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
999 mysql_init_vars 1097 mysql_init_vars
1000 1098
1001 emake install \ 1099 emake install \
1002 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
1003 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
1004 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
1005 || die "emake install failed" 1103 || die "emake install failed"
1006 1104
1007 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1008 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1014 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1015 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
1016 1114
1017 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
1018 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
1019 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
1020 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
1021 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
1022 do 1120 do
1023 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
1024 done 1122 done
1025 1123
1026 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
1027 if use minimal ; then 1125 if use minimal ; then
1028 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
1029 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
1030 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} 1128 rm -f "${ED}"/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}
1031 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
1032 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1130 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
1033 fi 1131 fi
1034 1132
1035 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
1036 # testsuite. It DOES have a use to be installed, esp. when you want to do a 1134 # testsuite. It DOES have a use to be installed, esp. when you want to do a
1038 if use !test ; then 1136 if use !test ; then
1039 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1137 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
1040 fi 1138 fi
1041 1139
1042 # Configuration stuff 1140 # Configuration stuff
1043 if mysql_version_is_at_least "5.1" ; then 1141 case ${MYSQL_PV_MAJOR} in
1044 mysql_mycnf_version="5.1"
1045 elif mysql_version_is_at_least "4.1" ; then
1046 mysql_mycnf_version="4.1"
1047 else
1048 mysql_mycnf_version="4.0" 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
1049 fi 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
1050 einfo "Building default my.cnf" 1144 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1145 esac
1146 einfo "Building default my.cnf (${mysql_mycnf_version})"
1051 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
1052 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
1053 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
1054 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1151 -e "s!/tmp!${EPREFIX}/tmp!" \
1152 -e "s!/usr!${EPREFIX}/usr!" \
1153 -e "s!= /var!= ${EPREFIX}/var!" \
1154 "${FILESDIR}/${mycnf_src}" \
1055 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
1056 if mysql_version_is_at_least "4.1" && use latin1 ; then 1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
1157 if use latin1 ; then
1057 sed -i \ 1158 sed -i \
1058 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
1059 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
1060 fi 1161 fi
1061 newins "${TMPDIR}/my.cnf.ok" my.cnf 1162 newins "${TMPDIR}/my.cnf.ok" my.cnf
1064 if ! use minimal ; then 1165 if ! use minimal ; then
1065 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
1066 # Empty directories ... 1167 # Empty directories ...
1067 diropts "-m0750" 1168 diropts "-m0750"
1068 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
1069 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
1070 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
1071 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
1072 fi 1173 fi
1073 1174
1074 diropts "-m0755" 1175 diropts "-m0755"
1075 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
1076 dodir "${folder}" 1177 dodir "${folder}"
1077 keepdir "${folder}" 1178 keepdir "${folder}"
1078 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
1079 done 1180 done
1080 fi 1181 fi
1081 1182
1082 # Docs 1183 # Docs
1083 einfo "Installing docs" 1184 einfo "Installing docs"
1084 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1185 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
1186 [[ -f "$i" ]] && dodoc "$i"
1187 done
1085 doinfo "${S}"/Docs/mysql.info 1188 doinfo "${S}"/Docs/mysql.info
1086 1189
1087 # Minimal builds don't have the MySQL server 1190 # Minimal builds don't have the MySQL server
1088 if ! use minimal ; then 1191 if ! use minimal ; then
1089 einfo "Including support files and sample configurations" 1192 einfo "Including support files and sample configurations"
1101 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
1102 done 1205 done
1103 1206
1104 fi 1207 fi
1105 1208
1106 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
1107} 1210}
1108 1211
1109# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
1110# @DESCRIPTION: 1213# @DESCRIPTION:
1111# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
1125mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1126 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1127 mysql_init_vars 1230 mysql_init_vars
1128 1231
1129 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1130 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 1233 [[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
1131 1234
1132 # Secure the logfiles 1235 # Secure the logfiles
1133 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1134 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1135 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1156 einfo 1259 einfo
1157 elog "You might want to run:" 1260 elog "You might want to run:"
1158 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1261 elog "\"emerge --config =${CATEGORY}/${PF}\""
1159 elog "if this is a new install." 1262 elog "if this is a new install."
1160 einfo 1263 einfo
1264
1265 einfo
1266 elog "If you are upgrading major versions, you should run the"
1267 elog "mysql_upgrade tool."
1268 einfo
1161 fi 1269 fi
1162 1270
1163 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1164 # TODO: explain it better 1272 elog "Note: PBXT is now statically built when enabled."
1165 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1273 elog ""
1166 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1274 elog "If, you previously installed as a plugin and "
1167 elog "if, after that, you cannot start the MySQL server," 1275 elog "you cannot start the MySQL server,"
1168 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1276 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1169 elog "use the MySQL upgrade script to restore the table" 1277 elog "use the MySQL upgrade script to restore the table"
1170 elog "or execute the following SQL command:" 1278 elog "or execute the following SQL command:"
1171 elog " CREATE TABLE IF NOT EXISTS plugin (" 1279 elog " CREATE TABLE IF NOT EXISTS plugin ("
1172 elog " name char(64) binary DEFAULT '' NOT NULL," 1280 elog " name char(64) binary DEFAULT '' NOT NULL,"
1178 mysql_check_version_range "4.0 to 5.0.99.99" \ 1286 mysql_check_version_range "4.0 to 5.0.99.99" \
1179 && use berkdb \ 1287 && use berkdb \
1180 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 1288 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
1181} 1289}
1182 1290
1291# @FUNCTION: mysql_getopt
1292# @DESCRIPTION:
1293# Use my_print_defaults to extract specific config options
1294mysql_getopt() {
1295 local mypd="${EROOT}"/usr/bin/my_print_defaults
1296 section="$1"
1297 flag="--${2}="
1298 "${mypd}" $section | sed -n "/^${flag}/p"
1299}
1300
1301# @FUNCTION: mysql_getoptval
1302# @DESCRIPTION:
1303# Use my_print_defaults to extract specific config options
1304mysql_getoptval() {
1305 local mypd="${EROOT}"/usr/bin/my_print_defaults
1306 section="$1"
1307 flag="--${2}="
1308 "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
1309}
1310
1183# @FUNCTION: mysql_pkg_config 1311# @FUNCTION: mysql_pkg_config
1184# @DESCRIPTION: 1312# @DESCRIPTION:
1185# Configure mysql environment. 1313# Configure mysql environment.
1186mysql_pkg_config() { 1314mysql_pkg_config() {
1187 local old_MY_DATADIR="${MY_DATADIR}" 1315 local old_MY_DATADIR="${MY_DATADIR}"
1316 local old_HOME="${HOME}"
1317 # my_print_defaults needs to read stuff in $HOME/.my.cnf
1318 export HOME=/root
1188 1319
1189 # Make sure the vars are correctly initialized 1320 # Make sure the vars are correctly initialized
1190 mysql_init_vars 1321 mysql_init_vars
1191 1322
1192 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 1323 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
1194 if built_with_use ${CATEGORY}/${PN} minimal ; then 1325 if built_with_use ${CATEGORY}/${PN} minimal ; then
1195 die "Minimal builds do NOT include the MySQL server" 1326 die "Minimal builds do NOT include the MySQL server"
1196 fi 1327 fi
1197 1328
1198 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1329 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1199 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 1330 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
1331 MY_DATADIR_s="${MY_DATADIR_s%%/}"
1200 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 1332 local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
1333 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
1201 1334
1202 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1335 if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
1203 if [[ -d "${MY_DATADIR_s}" ]]; then 1336 if [[ -d "${MY_DATADIR_s}" ]]; then
1204 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1337 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1205 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 1338 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
1206 else 1339 else
1207 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" 1340 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
1219 fi 1352 fi
1220 fi 1353 fi
1221 1354
1222 local pwd1="a" 1355 local pwd1="a"
1223 local pwd2="b" 1356 local pwd2="b"
1224 local MYSQL_ROOT_PASSWORD=''
1225 local maxtry=15 1357 local maxtry=15
1226 1358
1227 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1359 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1228 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")" 1360 MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
1361 fi
1362 MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
1363 # These are dir+prefix
1364 MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
1365 MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
1366 MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
1367 MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
1368
1369 if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
1370 einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
1371 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
1372 fi
1373 if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
1374 einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
1375 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
1376 fi
1377 if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
1378 einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
1379 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
1229 fi 1380 fi
1230 1381
1231 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1382 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1232 ewarn "You have already a MySQL database in place." 1383 ewarn "You have already a MySQL database in place."
1233 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1384 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1239 # localhost. Also causes weird failures. 1390 # localhost. Also causes weird failures.
1240 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1391 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1241 1392
1242 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then 1393 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1243 1394
1244 einfo "Please provide a password for the mysql 'root' user now," 1395 einfo "Please provide a password for the mysql 'root' user now, in the"
1245 einfo "or in the MYSQL_ROOT_PASSWORD env var." 1396 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1246 ewarn "Avoid [\"'\\_%] characters in the password" 1397 ewarn "Avoid [\"'\\_%] characters in the password"
1247 read -rsp " >" pwd1 ; echo 1398 read -rsp " >" pwd1 ; echo
1248 1399
1249 einfo "Retype the password" 1400 einfo "Retype the password"
1250 read -rsp " >" pwd2 ; echo 1401 read -rsp " >" pwd2 ; echo
1254 fi 1405 fi
1255 MYSQL_ROOT_PASSWORD="${pwd1}" 1406 MYSQL_ROOT_PASSWORD="${pwd1}"
1256 unset pwd1 pwd2 1407 unset pwd1 pwd2
1257 fi 1408 fi
1258 1409
1259 local options="" 1410 local options="--log-warnings=0"
1260 local sqltmp="$(emktemp)" 1411 local sqltmp="$(emktemp)"
1261 1412
1262 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" 1413 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
1263 [[ -r "${help_tables}" ]] \ 1414 [[ -r "${help_tables}" ]] \
1264 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1415 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1265 || touch "${TMPDIR}/fill_help_tables.sql" 1416 || touch "${TMPDIR}/fill_help_tables.sql"
1266 help_tables="${TMPDIR}/fill_help_tables.sql" 1417 help_tables="${TMPDIR}/fill_help_tables.sql"
1267 1418
1419 # Figure out which options we need to disable to do the setup
1420 helpfile="${TMPDIR}/mysqld-help"
1421 ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1422 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1423 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1424 ndbcluster log-slave-updates \
1425 ; do
1426 optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
1427 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1428 done
1429 # But some options changed names
1430 egrep -sq external-locking "${helpfile}" && \
1431 options="${options/skip-locking/skip-external-locking}"
1432
1433 use prefix || options="${options} --user=mysql"
1434
1268 pushd "${TMPDIR}" &>/dev/null 1435 pushd "${TMPDIR}" &>/dev/null
1269 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 1436 #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
1437 cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
1438 [ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db
1439 cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
1440 einfo "Command: $cmd"
1441 eval $cmd \
1442 >"${TMPDIR}"/mysql_install_db.log 2>&1
1270 if [ $? -ne 0 ]; then 1443 if [ $? -ne 0 ]; then
1271 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 1444 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1272 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 1445 die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1273 fi 1446 fi
1274 popd &>/dev/null 1447 popd &>/dev/null
1275 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1448 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1276 || die "MySQL databases not installed" 1449 || die "MySQL databases not installed"
1277 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1450 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1278 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1451 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1279 1452
1280 # Figure out which options we need to disable to do the setup
1281 helpfile="${TMPDIR}/mysqld-help"
1282 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1283 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1284 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1285 ; do
1286 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1287 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1288 done
1289 # But some options changed names
1290 egrep -sq external-locking "${helpfile}" && \
1291 options="${options/skip-locking/skip-external-locking}"
1292
1293 if mysql_version_is_at_least "4.1.3" ; then 1453 if mysql_version_is_at_least "4.1.3" ; then
1294 # Filling timezones, see 1454 # Filling timezones, see
1295 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1455 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1296 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1456 "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1297 1457
1298 if [[ -r "${help_tables}" ]] ; then 1458 if [[ -r "${help_tables}" ]] ; then
1299 cat "${help_tables}" >> "${sqltmp}" 1459 cat "${help_tables}" >> "${sqltmp}"
1300 fi 1460 fi
1301 fi 1461 fi
1302 1462
1303 einfo "Creating the mysql database and setting proper" 1463 einfo "Creating the mysql database and setting proper"
1304 einfo "permissions on it ..." 1464 einfo "permissions on it ..."
1305 1465
1306 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1466 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1307 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1467 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1308 local mysqld="${ROOT}/usr/sbin/mysqld \ 1468 local mysqld="${EROOT}/usr/sbin/mysqld \
1309 ${options} \ 1469 ${options} \
1310 --user=mysql \ 1470 --user=mysql \
1471 --log-warnings=0 \
1311 --basedir=${ROOT}/usr \ 1472 --basedir=${EROOT}/usr \
1312 --datadir=${ROOT}/${MY_DATADIR} \ 1473 --datadir=${ROOT}/${MY_DATADIR} \
1313 --max_allowed_packet=8M \ 1474 --max_allowed_packet=8M \
1314 --net_buffer_length=16K \ 1475 --net_buffer_length=16K \
1315 --default-storage-engine=MyISAM \ 1476 --default-storage-engine=MyISAM \
1316 --socket=${socket} \ 1477 --socket=${socket} \
1317 --pid-file=${pidfile}" 1478 --pid-file=${pidfile}"
1318 #einfo "About to start mysqld: ${mysqld}" 1479 #einfo "About to start mysqld: ${mysqld}"
1319 ebegin "Starting mysqld" 1480 ebegin "Starting mysqld"
1481 einfo "Command ${mysqld}"
1320 ${mysqld} & 1482 ${mysqld} &
1321 rc=$? 1483 rc=$?
1322 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1484 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1323 maxtry=$((${maxtry}-1)) 1485 maxtry=$((${maxtry}-1))
1324 echo -n "." 1486 echo -n "."
1331 fi 1493 fi
1332 1494
1333 ebegin "Setting root password" 1495 ebegin "Setting root password"
1334 # Do this from memory, as we don't want clear text passwords in temp files 1496 # Do this from memory, as we don't want clear text passwords in temp files
1335 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" 1497 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1336 "${ROOT}/usr/bin/mysql" \ 1498 "${EROOT}/usr/bin/mysql" \
1337 --socket=${socket} \ 1499 --socket=${socket} \
1338 -hlocalhost \ 1500 -hlocalhost \
1339 -e "${sql}" 1501 -e "${sql}"
1340 eend $? 1502 eend $?
1341 1503
1342 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1504 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1343 "${ROOT}/usr/bin/mysql" \ 1505 "${EROOT}/usr/bin/mysql" \
1344 --socket=${socket} \ 1506 --socket=${socket} \
1345 -hlocalhost \ 1507 -hlocalhost \
1346 -uroot \ 1508 -uroot \
1347 -p"${MYSQL_ROOT_PASSWORD}" \ 1509 --password="${MYSQL_ROOT_PASSWORD}" \
1348 mysql < "${sqltmp}" 1510 mysql < "${sqltmp}"
1349 rc=$? 1511 rc=$?
1350 eend $? 1512 eend $?
1351 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!" 1513 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1352 1514
1360 1522
1361# @FUNCTION: mysql_pkg_postrm 1523# @FUNCTION: mysql_pkg_postrm
1362# @DESCRIPTION: 1524# @DESCRIPTION:
1363# Remove mysql symlinks. 1525# Remove mysql symlinks.
1364mysql_pkg_postrm() { 1526mysql_pkg_postrm() {
1365 : # mysql_lib_symlinks "${D}" 1527 : # mysql_lib_symlinks "${ED}"
1366} 1528}

Legend:
Removed from v.1.148  
changed lines
  Added in v.1.176

  ViewVC Help
Powered by ViewVC 1.1.20