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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.73  
changed lines
  Added in v.1.88

  ViewVC Help
Powered by ViewVC 1.1.20