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

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

  ViewVC Help
Powered by ViewVC 1.1.20