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

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

  ViewVC Help
Powered by ViewVC 1.1.20