/[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.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.72 2007/03/16 22:47:29 chtekk 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}
91 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
74 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 92 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
75mysql_version_is_at_least "5.1.12" \ 93mysql_version_is_at_least "5.1.12" \
76&& [[ -n "${PBXT_VERSION}" ]] \ 94&& [[ -n "${PBXT_VERSION}" ]] \
77&& 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 )"
78 96
79DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 97DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
80HOMEPAGE="http://www.mysql.com/" 98HOMEPAGE="http://www.mysql.com/"
81LICENSE="GPL-2" 99LICENSE="GPL-2"
82SLOT="0" 100SLOT="0"
83IUSE="big-tables debug embedded minimal perl selinux ssl static" 101IUSE="big-tables debug embedded minimal perl selinux ssl static"
84RESTRICT="confcache"
85 102
86mysql_version_is_at_least "4.1" \ 103mysql_version_is_at_least "4.1" \
87&& IUSE="${IUSE} latin1" 104&& IUSE="${IUSE} latin1"
88 105
89mysql_version_is_at_least "4.1.3" \ 106mysql_version_is_at_least "4.1.3" \
… …
197 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 214 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
198 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 215 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
199 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 216 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
200 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 217 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
201 218
202 if [[ -z "${DATADIR}" ]] ; then 219 if [[ -z "${MY_DATADIR}" ]] ; then
203 DATADIR="" 220 MY_DATADIR=""
204 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 221 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
205 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 222 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
206 | sed -ne '/datadir/s|^--datadir=||p' \ 223 | sed -ne '/datadir/s|^--datadir=||p' \
207 | tail -n1` 224 | tail -n1`
208 if [[ -z "${DATADIR}" ]] ; then 225 if [[ -z "${MY_DATADIR}" ]] ; then
209 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 226 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
210 | sed -e 's/.*=\s*//'` 227 | sed -e 's/.*=\s*//'`
211 fi 228 fi
212 fi 229 fi
213 if [[ -z "${DATADIR}" ]] ; then 230 if [[ -z "${MY_DATADIR}" ]] ; then
214 DATADIR="${MY_LOCALSTATEDIR}" 231 MY_DATADIR="${MY_LOCALSTATEDIR}"
215 einfo "Using default DATADIR" 232 einfo "Using default MY_DATADIR"
216 fi 233 fi
217 elog "MySQL DATADIR is ${DATADIR}" 234 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
218 235
219 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 236 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
220 if [[ -e "${DATADIR}" ]] ; then 237 if [[ -e "${MY_DATADIR}" ]] ; then
221 elog "Previous datadir found, it's YOUR job to change" 238 elog "Previous datadir found, it's YOUR job to change"
222 elog "ownership and take care of it" 239 elog "ownership and take care of it"
223 PREVIOUS_DATADIR="yes" 240 PREVIOUS_DATADIR="yes"
224 else 241 else
225 PREVIOUS_DATADIR="no" 242 PREVIOUS_DATADIR="no"
… …
231 MY_SOURCEDIR=${SERVER_URI##*/} 248 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 249 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 250
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 251 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 252 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 253 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 254}
238 255
239configure_minimal() { 256configure_minimal() {
240 # These are things we exclude from a minimal build, please 257 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 258 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 259 # but we then delete it before packaging.
243 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"
244 261
245 for i in ${minimal_exclude_list} ; do 262 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 263 myconf="${myconf} --without-${i}"
247 done 264 done
248 myconf="${myconf} --with-extra-charsets=none" 265 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 266 myconf="${myconf} --enable-local-infile"
250 267
251 if use static ; then 268 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 269 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 270 myconf="${myconf} --disable-shared --with-pic"
254 else 271 else
255 myconf="${myconf} --enable-shared --enable-static" 272 myconf="${myconf} --enable-shared --enable-static"
256 fi 273 fi
257 274
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 275 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
… …
274 myconf="${myconf} --without-libwrap" 291 myconf="${myconf} --without-libwrap"
275 292
276 if use static ; then 293 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 294 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 295 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 296 myconf="${myconf} --disable-shared --with-pic"
280 else 297 else
281 myconf="${myconf} --enable-shared --enable-static" 298 myconf="${myconf} --enable-shared --enable-static"
282 fi 299 fi
283 300
284 if use debug ; then 301 if use debug ; then
… …
326 myconf="${myconf} $(use_with ssl)" 343 myconf="${myconf} $(use_with ssl)"
327 else 344 else
328 myconf="${myconf} $(use_with ssl openssl)" 345 myconf="${myconf} $(use_with ssl openssl)"
329 fi 346 fi
330 347
348 if use berkdb ; then
331 # 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:
332 # 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
333 # It comes down to non-64-bit safety problems. 351 # It comes down to non-64-bit safety problems.
334 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
335 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
336 myconf="${myconf} --without-berkeley-db" 359 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 360 fi
344 361
345 if mysql_version_is_at_least "4.1.3" ; then 362 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 363 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 364 myconf="${myconf} $(use_with cluster ndbcluster)"
… …
440} 457}
441 458
442# 459#
443# EBUILD FUNCTIONS 460# EBUILD FUNCTIONS
444# 461#
445
446mysql_pkg_setup() { 462mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 463 if hasq test ${FEATURES} ; then
448 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
449 470
450 # Check for USE flag problems in pkg_setup 471 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 472 if use static && use ssl ; then
452 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!"
453 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!"
… …
465 && ( use cluster || use extraengine ) \ 486 && ( use cluster || use extraengine ) \
466 && use minimal ; then 487 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 488 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 489 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 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"
470 495
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 496 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 497 && use berkdb \
473 && 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!"
474} 499}
… …
476mysql_src_unpack() { 501mysql_src_unpack() {
477 # Initialize the proper variables first 502 # Initialize the proper variables first
478 mysql_init_vars 503 mysql_init_vars
479 504
480 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
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 509 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
482 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
483 bitkeeper_fetch "mysql-5.1-ndb" 511 bitkeeper_fetch "mysql-5.1-ndb"
484 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
485 bitkeeper_fetch "mysql-5.2-falcon" 513 bitkeeper_fetch "mysql-5.2-falcon"
… …
495 fi 523 fi
496 524
497 # Apply the patches for this MySQL version 525 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 526 EPATCH_SUFFIX="patch"
499 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
500 mysql_mv_patches 531 mysql_mv_patches
532 # And apply
501 epatch 533 epatch
502 534
503 # Additional checks, remove bundled zlib 535 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 536 rm -f "${S}/zlib/"*.[ch]
505 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"
… …
521 553
522 local rebuilddirlist d 554 local rebuilddirlist d
523 555
524 if mysql_version_is_at_least "5.1.12" ; then 556 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 557 rebuilddirlist="."
526 # TODO: check this with a cmake expert 558 # TODO: check this with a cmake expert
527 use innodb \ 559 use innodb \
528 && cmake \ 560 && cmake \
529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 561 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 562 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 563 "storage/innobase"
532 else 564 else
533 rebuilddirlist=". innobase" 565 rebuilddirlist=". innobase"
534 fi 566 fi
535 567
… …
644 else 676 else
645 mysql_mycnf_version="4.0" 677 mysql_mycnf_version="4.0"
646 fi 678 fi
647 insinto "${MY_SYSCONFDIR}" 679 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 680 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 681 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 682 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 683 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 684 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 685 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 686 fi
… …
657 # Minimal builds don't have the MySQL server 689 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 690 if ! use minimal ; then
659 # Empty directories ... 691 # Empty directories ...
660 diropts "-m0750" 692 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 693 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 694 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 695 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 696 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 697 fi
666 698
667 diropts "-m0755" 699 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 700 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 701 dodir "${folder}"
… …
672 done 704 done
673 fi 705 fi
674 706
675 # Docs 707 # Docs
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 708 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
709 doinfo ${S}/Docs/mysql.info
677 710
678 # Minimal builds don't have the MySQL server 711 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 712 if ! use minimal ; then
680 docinto "support-files" 713 docinto "support-files"
681 for script in \ 714 for script in \
… …
688 721
689 docinto "scripts" 722 docinto "scripts"
690 for script in scripts/mysql* ; do 723 for script in scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 724 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 725 done
726
693 fi 727 fi
694 728
695 mysql_lib_symlinks "${D}" 729 mysql_lib_symlinks "${D}"
696} 730}
697 731
… …
757 791
758mysql_pkg_config() { 792mysql_pkg_config() {
759 # Make sure the vars are correctly initialized 793 # Make sure the vars are correctly initialized
760 mysql_init_vars 794 mysql_init_vars
761 795
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 796 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 797
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 798 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 die "Minimal builds do NOT include the MySQL server" 799 die "Minimal builds do NOT include the MySQL server"
766 fi 800 fi
767 801
768 local pwd1="a" 802 local pwd1="a"
769 local pwd2="b" 803 local pwd2="b"
770 local maxtry=5 804 local maxtry=5
771 805
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 806 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 807 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 808 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 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."
776 die "MySQL database already exists!" 810 die "MySQL database already exists!"
777 fi 811 fi
778 812
779 einfo "Creating the mysql database and setting proper" 813 einfo "Creating the mysql database and setting proper"
… …
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 832 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 833 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 834 help_tables="${TMPDIR}/fill_help_tables.sql"
801 835
802 pushd "${TMPDIR}" &>/dev/null 836 pushd "${TMPDIR}" &>/dev/null
803 "${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
804 popd &>/dev/null 842 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 843 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 844 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 845 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 846 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
809 847
810 if mysql_version_is_at_least "4.1.3" ; then 848 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 849 options="--skip-ndbcluster"
812 850
813 # Filling timezones, see 851 # Filling timezones, see
… …
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 862 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 863 ${options} \
826 --user=mysql \ 864 --user=mysql \
827 --skip-grant-tables \ 865 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 866 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 867 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 868 --skip-innodb \
831 --skip-bdb \ 869 --skip-bdb \
832 --skip-networking \ 870 --skip-networking \
833 --max_allowed_packet=8M \ 871 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 872 --net_buffer_length=16K \
Legend:
Removed from v.1.72  
changed lines
  Added in v.1.87
  ViewVC Help
Powered by ViewVC 1.1.13