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

Diff of /eclass/mysql.eclass

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

Revision 1.72 Revision 1.89
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 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.72 2007/03/16 22:47:29 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.89 2008/04/05 00:43:26 robbat2 Exp $
4 4
5# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
6# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
7 8# - Robin H. Johnson <robbat2@gentoo.org>
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
9# Note that MYSQL_VERSION_ID must be empty!
10 9
11WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
12WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
13 12
14inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx
16# Shorten the path because the socket path length must be shorter than 107 chars 15# Shorten the path because the socket path length must be shorter than 107 chars
17# and we will run a mysql server during test phase 16# and we will run a mysql server during test phase
18S="${WORKDIR}/mysql" 17S="${WORKDIR}/mysql"
19 18
20[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21 EGIT_PROJECT=mysql-extras
22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23 inherit git
24fi
21 25
22if [[ ${PR#r} -lt 60 ]] ; then 26if [[ ${PR#r} -lt 60 ]] ; then
23 IS_BITKEEPER=0 27 IS_BITKEEPER=0
24elif [[ ${PR#r} -lt 90 ]] ; then 28elif [[ ${PR#r} -lt 90 ]] ; then
25 IS_BITKEEPER=60 29 IS_BITKEEPER=60
30# MYSQL_VERSION_ID will be: 34# MYSQL_VERSION_ID will be:
31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 35# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
32# This is an important part, because many of the choices the MySQL ebuild will do 36# This is an important part, because many of the choices the MySQL ebuild will do
33# depend on this variable. 37# depend on this variable.
34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 38# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
39# We also strip off upstream's trailing letter that they use to respin tarballs
35 40
36MYSQL_VERSION_ID="" 41MYSQL_VERSION_ID=""
42tpv="${PV%[a-z]}"
37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 43tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
38for vatom in 0 1 2 3 ; do 44for vatom in 0 1 2 3 ; do
39 # pad to length 2 45 # pad to length 2
40 tpv[${vatom}]="00${tpv[${vatom}]}" 46 tpv[${vatom}]="00${tpv[${vatom}]}"
41 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 47 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
42done 48done
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 73PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 74
69# BitKeeper dependency, compile-time only 75# BitKeeper dependency, compile-time only
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 76[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
71 77
78# Work out the default SERVER_URI correctly
79if [ -z "${SERVER_URI}" ]; then
80 # The community build is on the mirrors
81 if [ "${PN}" == "mysql-community" ]; then
82 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
83 # The enterprise source is on the primary site only
84 elif [ "${PN}" == "mysql" ]; then
85 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
86 fi
87fi
88
72# Define correct SRC_URIs 89# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 90SRC_URI="${SERVER_URI}"
91
92[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
93 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
74 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 94 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
75mysql_version_is_at_least "5.1.12" \ 95mysql_version_is_at_least "5.1.12" \
76&& [[ -n "${PBXT_VERSION}" ]] \ 96&& [[ -n "${PBXT_VERSION}" ]] \
77&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 97&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
78 98
79DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 99DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
80HOMEPAGE="http://www.mysql.com/" 100HOMEPAGE="http://www.mysql.com/"
81LICENSE="GPL-2" 101LICENSE="GPL-2"
82SLOT="0" 102SLOT="0"
83IUSE="big-tables debug embedded minimal perl selinux ssl static" 103IUSE="big-tables debug embedded minimal perl selinux ssl static"
84RESTRICT="confcache"
85 104
86mysql_version_is_at_least "4.1" \ 105mysql_version_is_at_least "4.1" \
87&& IUSE="${IUSE} latin1" 106&& IUSE="${IUSE} latin1"
88 107
89mysql_version_is_at_least "4.1.3" \ 108mysql_version_is_at_least "4.1.3" \
197 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 216 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
198 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 217 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
199 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 218 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
200 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 219 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
201 220
202 if [[ -z "${DATADIR}" ]] ; then 221 if [[ -z "${MY_DATADIR}" ]] ; then
203 DATADIR="" 222 MY_DATADIR=""
204 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 223 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
205 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 224 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
206 | sed -ne '/datadir/s|^--datadir=||p' \ 225 | sed -ne '/datadir/s|^--datadir=||p' \
207 | tail -n1` 226 | tail -n1`
208 if [[ -z "${DATADIR}" ]] ; then 227 if [[ -z "${MY_DATADIR}" ]] ; then
209 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 228 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
210 | sed -e 's/.*=\s*//'` 229 | sed -e 's/.*=\s*//' \
230 | tail -n1`
211 fi 231 fi
212 fi 232 fi
213 if [[ -z "${DATADIR}" ]] ; then 233 if [[ -z "${MY_DATADIR}" ]] ; then
214 DATADIR="${MY_LOCALSTATEDIR}" 234 MY_DATADIR="${MY_LOCALSTATEDIR}"
215 einfo "Using default DATADIR" 235 einfo "Using default MY_DATADIR"
216 fi 236 fi
217 elog "MySQL DATADIR is ${DATADIR}" 237 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
218 238
219 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 239 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
220 if [[ -e "${DATADIR}" ]] ; then 240 if [[ -e "${MY_DATADIR}" ]] ; then
221 elog "Previous datadir found, it's YOUR job to change" 241 elog "Previous datadir found, it's YOUR job to change"
222 elog "ownership and take care of it" 242 elog "ownership and take care of it"
223 PREVIOUS_DATADIR="yes" 243 PREVIOUS_DATADIR="yes"
224 else 244 else
225 PREVIOUS_DATADIR="no" 245 PREVIOUS_DATADIR="no"
231 MY_SOURCEDIR=${SERVER_URI##*/} 251 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 252 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 253
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 254 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 255 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 256 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 257}
238 258
239configure_minimal() { 259configure_minimal() {
240 # These are things we exclude from a minimal build, please 260 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 261 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 262 # but we then delete it before packaging.
243 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 263 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
244 264
245 for i in ${minimal_exclude_list} ; do 265 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 266 myconf="${myconf} --without-${i}"
247 done 267 done
248 myconf="${myconf} --with-extra-charsets=none" 268 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 269 myconf="${myconf} --enable-local-infile"
250 270
251 if use static ; then 271 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 272 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 273 myconf="${myconf} --disable-shared --with-pic"
254 else 274 else
255 myconf="${myconf} --enable-shared --enable-static" 275 myconf="${myconf} --enable-shared --enable-static"
256 fi 276 fi
257 277
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 278 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
274 myconf="${myconf} --without-libwrap" 294 myconf="${myconf} --without-libwrap"
275 295
276 if use static ; then 296 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 297 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 298 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 299 myconf="${myconf} --disable-shared --with-pic"
280 else 300 else
281 myconf="${myconf} --enable-shared --enable-static" 301 myconf="${myconf} --enable-shared --enable-static"
282 fi 302 fi
283 303
284 if use debug ; then 304 if use debug ; then
326 myconf="${myconf} $(use_with ssl)" 346 myconf="${myconf} $(use_with ssl)"
327 else 347 else
328 myconf="${myconf} $(use_with ssl openssl)" 348 myconf="${myconf} $(use_with ssl openssl)"
329 fi 349 fi
330 350
351 if use berkdb ; then
331 # The following fix is due to a bug with bdb on SPARC's. See: 352 # The following fix is due to a bug with bdb on SPARC's. See:
332 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 353 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
333 # It comes down to non-64-bit safety problems. 354 # It comes down to non-64-bit safety problems.
334 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 355 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
335 elog "Berkeley DB support was disabled due to incompatible arch" 356 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
357 myconf="${myconf} --without-berkeley-db"
358 else
359 myconf="${myconf} --with-berkeley-db=./bdb"
360 fi
361 else
336 myconf="${myconf} --without-berkeley-db" 362 myconf="${myconf} --without-berkeley-db"
337 else
338 if use berkdb ; then
339 myconf="${myconf} --with-berkeley-db=./bdb"
340 else
341 myconf="${myconf} --without-berkeley-db"
342 fi
343 fi 363 fi
344 364
345 if mysql_version_is_at_least "4.1.3" ; then 365 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 366 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 367 myconf="${myconf} $(use_with cluster ndbcluster)"
440} 460}
441 461
442# 462#
443# EBUILD FUNCTIONS 463# EBUILD FUNCTIONS
444# 464#
445
446mysql_pkg_setup() { 465mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 466 if hasq test ${FEATURES} ; then
448 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 467 if ! use minimal ; then
468 if ! hasq userpriv ${FEATURES} ; then
469 die "Testing with FEATURES=-userpriv is no longer supported by upstream"
470 fi
471 fi
472 fi
449 473
450 # Check for USE flag problems in pkg_setup 474 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 475 if use static && use ssl ; then
452 eerror "MySQL does not support being built statically with SSL support enabled!" 476 eerror "MySQL does not support being built statically with SSL support enabled!"
453 die "MySQL does not support being built statically with SSL support enabled!" 477 die "MySQL does not support being built statically with SSL support enabled!"
465 && ( use cluster || use extraengine ) \ 489 && ( use cluster || use extraengine ) \
466 && use minimal ; then 490 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 491 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 492 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 fi 493 fi
494
495 # This should come after all of the die statements
496 enewgroup mysql 60 || die "problem adding 'mysql' group"
497 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
470 498
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 499 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 500 && use berkdb \
473 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 501 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
474} 502}
476mysql_src_unpack() { 504mysql_src_unpack() {
477 # Initialize the proper variables first 505 # Initialize the proper variables first
478 mysql_init_vars 506 mysql_init_vars
479 507
480 unpack ${A} 508 unpack ${A}
509 # Grab the patches
510 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
511 # Bitkeeper checkout support
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 512 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
482 if mysql_check_version_range "5.1 to 5.1.99" ; then 513 if mysql_check_version_range "5.1 to 5.1.99" ; then
483 bitkeeper_fetch "mysql-5.1-ndb" 514 bitkeeper_fetch "mysql-5.1-ndb"
484 elif mysql_check_version_range "5.2 to 5.2.99" ; then 515 elif mysql_check_version_range "5.2 to 5.2.99" ; then
485 bitkeeper_fetch "mysql-5.2-falcon" 516 bitkeeper_fetch "mysql-5.2-falcon"
495 fi 526 fi
496 527
497 # Apply the patches for this MySQL version 528 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 529 EPATCH_SUFFIX="patch"
499 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 530 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
531 # Clean out old items
532 rm -f "${EPATCH_SOURCE}"/*
533 # Now link in right patches
500 mysql_mv_patches 534 mysql_mv_patches
535 # And apply
501 epatch 536 epatch
502 537
503 # Additional checks, remove bundled zlib 538 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 539 rm -f "${S}/zlib/"*.[ch]
505 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 540 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
521 556
522 local rebuilddirlist d 557 local rebuilddirlist d
523 558
524 if mysql_version_is_at_least "5.1.12" ; then 559 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 560 rebuilddirlist="."
526 # TODO: check this with a cmake expert 561 # TODO: check this with a cmake expert
527 use innodb \ 562 use innodb \
528 && cmake \ 563 && cmake \
529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 564 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 565 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 566 "storage/innobase"
532 else 567 else
533 rebuilddirlist=". innobase" 568 rebuilddirlist=". innobase"
534 fi 569 fi
535 570
644 else 679 else
645 mysql_mycnf_version="4.0" 680 mysql_mycnf_version="4.0"
646 fi 681 fi
647 insinto "${MY_SYSCONFDIR}" 682 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 683 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 684 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 685 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 686 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 687 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 688 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 689 fi
657 # Minimal builds don't have the MySQL server 692 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 693 if ! use minimal ; then
659 # Empty directories ... 694 # Empty directories ...
660 diropts "-m0750" 695 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 696 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 697 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 698 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 699 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 700 fi
666 701
667 diropts "-m0755" 702 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 703 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 704 dodir "${folder}"
672 done 707 done
673 fi 708 fi
674 709
675 # Docs 710 # Docs
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 711 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
712 doinfo ${S}/Docs/mysql.info
677 713
678 # Minimal builds don't have the MySQL server 714 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 715 if ! use minimal ; then
680 docinto "support-files" 716 docinto "support-files"
681 for script in \ 717 for script in \
688 724
689 docinto "scripts" 725 docinto "scripts"
690 for script in scripts/mysql* ; do 726 for script in scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 727 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 728 done
729
693 fi 730 fi
694 731
695 mysql_lib_symlinks "${D}" 732 mysql_lib_symlinks "${D}"
696} 733}
697 734
757 794
758mysql_pkg_config() { 795mysql_pkg_config() {
759 # Make sure the vars are correctly initialized 796 # Make sure the vars are correctly initialized
760 mysql_init_vars 797 mysql_init_vars
761 798
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 799 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 800
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 801 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 die "Minimal builds do NOT include the MySQL server" 802 die "Minimal builds do NOT include the MySQL server"
766 fi 803 fi
767 804
768 local pwd1="a" 805 local pwd1="a"
769 local pwd2="b" 806 local pwd2="b"
770 local maxtry=5 807 local maxtry=5
771 808
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 809 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 810 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 811 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 ewarn "Please rename or delete it if you wish to replace it." 812 ewarn "Please rename or delete it if you wish to replace it."
776 die "MySQL database already exists!" 813 die "MySQL database already exists!"
777 fi 814 fi
778 815
779 einfo "Creating the mysql database and setting proper" 816 einfo "Creating the mysql database and setting proper"
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 835 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 836 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 837 help_tables="${TMPDIR}/fill_help_tables.sql"
801 838
802 pushd "${TMPDIR}" &>/dev/null 839 pushd "${TMPDIR}" &>/dev/null
803 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 840 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
841 if [ $? -ne 0 ]; then
842 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
843 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
844 fi
804 popd &>/dev/null 845 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 846 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 847 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 848 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 849 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
809 850
810 if mysql_version_is_at_least "4.1.3" ; then 851 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 852 options="--skip-ndbcluster"
812 853
813 # Filling timezones, see 854 # Filling timezones, see
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 865 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 866 ${options} \
826 --user=mysql \ 867 --user=mysql \
827 --skip-grant-tables \ 868 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 869 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 870 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 871 --skip-innodb \
831 --skip-bdb \ 872 --skip-bdb \
832 --skip-networking \ 873 --skip-networking \
833 --max_allowed_packet=8M \ 874 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 875 --net_buffer_length=16K \

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.89

  ViewVC Help
Powered by ViewVC 1.1.20