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

Diff of /eclass/mysql.eclass

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

Revision 1.84 Revision 1.100
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.84 2008/01/16 04:01:14 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.100 2008/11/14 22:07:03 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
43# strip leading "0" (otherwise it's considered an octal number by BASH) 49# strip leading "0" (otherwise it's considered an octal number by BASH)
44MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 50MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
45 51
46# Be warned, *DEPEND are version-dependant 52# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime
47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
48 userland_GNU? ( sys-process/procps ) 55 userland_GNU? ( sys-process/procps )
49 >=sys-apps/sed-4 56 >=sys-apps/sed-4
50 >=sys-apps/texinfo-4.7-r1 57 >=sys-apps/texinfo-4.7-r1
51 >=sys-libs/readline-4.1 58 >=sys-libs/readline-4.1
55for i in "" "-community" ; do 62for i in "" "-community" ; do
56 [[ "${i}" == ${PN#mysql} ]] || 63 [[ "${i}" == ${PN#mysql} ]] ||
57 DEPEND="${DEPEND} !dev-db/mysql${i}" 64 DEPEND="${DEPEND} !dev-db/mysql${i}"
58done 65done
59 66
67RDEPEND="${DEPEND}
68 !minimal? ( dev-db/mysql-init-scripts )
69 selinux? ( sec-policy/selinux-mysql )"
70
71# compile-time-only
60mysql_version_is_at_least "5.1" \ 72mysql_version_is_at_least "5.1" \
61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
62 74
75# compile-time-only
63mysql_version_is_at_least "5.1.12" \ 76mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
65 78
79# BitKeeper dependency, compile-time only
80[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
81
82
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68
69# BitKeeper dependency, compile-time only
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
71 85
72# Work out the default SERVER_URI correctly 86# Work out the default SERVER_URI correctly
73if [ -z "${SERVER_URI}" ]; then 87if [ -z "${SERVER_URI}" ]; then
74 # The community build is on the mirrors 88 # The community build is on the mirrors
75 if [ "${PN}" == "mysql-community" ]; then 89 if [ "${PN}" == "mysql-community" ]; then
79 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
80 fi 94 fi
81fi 95fi
82 96
83# Define correct SRC_URIs 97# Define correct SRC_URIs
84SRC_URI="${SERVER_URI} 98SRC_URI="${SERVER_URI}"
99
100[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
85 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 101 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
86 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 102 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
87mysql_version_is_at_least "5.1.12" \ 103mysql_version_is_at_least "5.1.12" \
88&& [[ -n "${PBXT_VERSION}" ]] \ 104&& [[ -n "${PBXT_VERSION}" ]] \
89&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 105&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
112mysql_version_is_at_least "5.1" \ 128mysql_version_is_at_least "5.1" \
113|| IUSE="${IUSE} berkdb" 129|| IUSE="${IUSE} berkdb"
114 130
115mysql_version_is_at_least "5.1.12" \ 131mysql_version_is_at_least "5.1.12" \
116&& IUSE="${IUSE} pbxt" 132&& IUSE="${IUSE} pbxt"
117
118RDEPEND="${DEPEND}
119 !minimal? ( dev-db/mysql-init-scripts )
120 selinux? ( sec-policy/selinux-mysql )"
121 133
122EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
123 pkg_postinst pkg_config pkg_postrm 135 pkg_postinst pkg_config pkg_postrm
124 136
125# 137#
216 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 228 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
217 | sed -ne '/datadir/s|^--datadir=||p' \ 229 | sed -ne '/datadir/s|^--datadir=||p' \
218 | tail -n1` 230 | tail -n1`
219 if [[ -z "${MY_DATADIR}" ]] ; then 231 if [[ -z "${MY_DATADIR}" ]] ; then
220 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 232 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
221 | sed -e 's/.*=\s*//'` 233 | sed -e 's/.*=\s*//' \
234 | tail -n1`
222 fi 235 fi
223 fi 236 fi
224 if [[ -z "${MY_DATADIR}" ]] ; then 237 if [[ -z "${MY_DATADIR}" ]] ; then
225 MY_DATADIR="${MY_LOCALSTATEDIR}" 238 MY_DATADIR="${MY_LOCALSTATEDIR}"
226 einfo "Using default MY_DATADIR" 239 einfo "Using default MY_DATADIR"
227 fi 240 fi
228 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 241 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
229 242
230 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
231 if [[ -e "${MY_DATADIR}" ]] ; then 244 if [[ -e "${MY_DATADIR}" ]] ; then
232 elog "Previous datadir found, it's YOUR job to change" 245 # If you get this and you're wondering about it, see bug #207636
233 elog "ownership and take care of it" 246 elog "MySQL datadir found in ${MY_DATADIR}"
247 elog "A new one will not be created."
234 PREVIOUS_DATADIR="yes" 248 PREVIOUS_DATADIR="yes"
235 else 249 else
236 PREVIOUS_DATADIR="no" 250 PREVIOUS_DATADIR="no"
237 fi 251 fi
238 export PREVIOUS_DATADIR 252 export PREVIOUS_DATADIR
299 mysql_version_is_at_least "4.1.3" \ 313 mysql_version_is_at_least "4.1.3" \
300 && use cluster \ 314 && use cluster \
301 && myconf="${myconf} --without-ndb-debug" 315 && myconf="${myconf} --without-ndb-debug"
302 fi 316 fi
303 317
318 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
319 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
320 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
321 ewarn "You MUST file bugs without these variables set."
322 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
323 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
304 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 324 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
305 myconf="${myconf} --with-charset=utf8" 325 myconf="${myconf} --with-charset=utf8"
306 myconf="${myconf} --with-collation=utf8_general_ci" 326 myconf="${myconf} --with-collation=utf8_general_ci"
307 else 327 else
308 myconf="${myconf} --with-charset=latin1" 328 myconf="${myconf} --with-charset=latin1"
309 myconf="${myconf} --with-collation=latin1_swedish_ci" 329 myconf="${myconf} --with-collation=latin1_swedish_ci"
310 fi 330 fi
311 331
312 if use embedded ; then 332 if use embedded ; then
313 myconf="${myconf} --with-embedded-privilege-control" 333 myconf="${myconf} --with-embedded-privilege-control"
314 myconf="${myconf} --with-embedded-server" 334 myconf="${myconf} --with-embedded-server"
336 if mysql_version_is_at_least "5.1.11" ; then 356 if mysql_version_is_at_least "5.1.11" ; then
337 myconf="${myconf} $(use_with ssl)" 357 myconf="${myconf} $(use_with ssl)"
338 else 358 else
339 myconf="${myconf} $(use_with ssl openssl)" 359 myconf="${myconf} $(use_with ssl openssl)"
340 fi 360 fi
341 361
362 if mysql_version_is_at_least "5.0.60" ; then
342 if use berkdb ; then 363 if use berkdb ; then
364 elog "Berkeley DB support was disabled due to build failures"
365 elog "on multiple arches, go to a version earlier than 5.0.60"
366 elog "if you want it again. Gentoo bug #224067."
367 fi
368 myconf="${myconf} --without-berkeley-db"
369 elif use berkdb ; then
343 # The following fix is due to a bug with bdb on SPARC's. See: 370 # The following fix is due to a bug with bdb on SPARC's. See:
344 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 371 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
345 # It comes down to non-64-bit safety problems. 372 # It comes down to non-64-bit safety problems.
346 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 373 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
347 elog "Berkeley DB support was disabled due to compatibility issues on this arch" 374 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
374 if mysql_version_is_at_least "5.0.3" ; then 401 if mysql_version_is_at_least "5.0.3" ; then
375 elog "Before using the Federated storage engine, please be sure to read" 402 elog "Before using the Federated storage engine, please be sure to read"
376 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 403 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
377 myconf="${myconf} --with-federated-storage-engine" 404 myconf="${myconf} --with-federated-storage-engine"
378 fi 405 fi
406 fi
407
408 if [ "${PN}" == "mysql-community" ]; then
409 myconf="${myconf} --enable-community-features"
379 fi 410 fi
380 411
381 mysql_version_is_at_least "5.0.18" \ 412 mysql_version_is_at_least "5.0.18" \
382 && use max-idx-128 \ 413 && use max-idx-128 \
383 && myconf="${myconf} --with-max-indexes=128" 414 && myconf="${myconf} --with-max-indexes=128"
454# EBUILD FUNCTIONS 485# EBUILD FUNCTIONS
455# 486#
456mysql_pkg_setup() { 487mysql_pkg_setup() {
457 if hasq test ${FEATURES} ; then 488 if hasq test ${FEATURES} ; then
458 if ! use minimal ; then 489 if ! use minimal ; then
459 if ! hasq userpriv ${FEATURES} ; then 490 if [[ $UID -eq 0 ]]; then
460 die "Testing with FEATURES=-userpriv is no longer supported by upstream" 491 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
461 fi 492 fi
462 fi 493 fi
463 fi 494 fi
495
496 # Bug #213475 - MySQL _will_ object strenously if your machine is named
497 # localhost. Also causes weird failures.
498 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
464 499
465 # Check for USE flag problems in pkg_setup 500 # Check for USE flag problems in pkg_setup
466 if use static && use ssl ; then 501 if use static && use ssl ; then
467 eerror "MySQL does not support being built statically with SSL support enabled!" 502 eerror "MySQL does not support being built statically with SSL support enabled!"
468 die "MySQL does not support being built statically with SSL support enabled!" 503 die "MySQL does not support being built statically with SSL support enabled!"
495mysql_src_unpack() { 530mysql_src_unpack() {
496 # Initialize the proper variables first 531 # Initialize the proper variables first
497 mysql_init_vars 532 mysql_init_vars
498 533
499 unpack ${A} 534 unpack ${A}
535 # Grab the patches
536 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
537 # Bitkeeper checkout support
500 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 538 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
501 if mysql_check_version_range "5.1 to 5.1.99" ; then 539 if mysql_check_version_range "5.1 to 5.1.99" ; then
502 bitkeeper_fetch "mysql-5.1-ndb" 540 bitkeeper_fetch "mysql-5.1-ndb"
503 elif mysql_check_version_range "5.2 to 5.2.99" ; then 541 elif mysql_check_version_range "5.2 to 5.2.99" ; then
504 bitkeeper_fetch "mysql-5.2-falcon" 542 bitkeeper_fetch "mysql-5.2-falcon"
514 fi 552 fi
515 553
516 # Apply the patches for this MySQL version 554 # Apply the patches for this MySQL version
517 EPATCH_SUFFIX="patch" 555 EPATCH_SUFFIX="patch"
518 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 556 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
557 # Clean out old items
558 rm -f "${EPATCH_SOURCE}"/*
559 # Now link in right patches
519 mysql_mv_patches 560 mysql_mv_patches
561 # And apply
520 epatch 562 epatch
521 563
522 # Additional checks, remove bundled zlib 564 # Additional checks, remove bundled zlib
523 rm -f "${S}/zlib/"*.[ch] 565 rm -f "${S}/zlib/"*.[ch]
524 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 566 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
562 if mysql_check_version_range "4.1 to 5.0.99.99" \ 604 if mysql_check_version_range "4.1 to 5.0.99.99" \
563 && use berkdb ; then 605 && use berkdb ; then
564 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 606 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
565 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 607 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
566 || die "Could not copy libtool.m4 to bdb/dist/" 608 || die "Could not copy libtool.m4 to bdb/dist/"
609 #These files exist only with libtool-2*, and need to be included.
610 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
611 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
612 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
613 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
614 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
615 fi
567 pushd "bdb/dist" &>/dev/null 616 pushd "bdb/dist" &>/dev/null
568 sh s_all \ 617 sh s_all \
569 || die "Failed bdb reconfigure" 618 || die "Failed bdb reconfigure"
570 popd &>/dev/null 619 popd &>/dev/null
571 fi 620 fi
691 done 740 done
692 fi 741 fi
693 742
694 # Docs 743 # Docs
695 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 744 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
696 doinfo ${S}/Docs/mysql.info 745 doinfo "${S}"/Docs/mysql.info
697 746
698 # Minimal builds don't have the MySQL server 747 # Minimal builds don't have the MySQL server
699 if ! use minimal ; then 748 if ! use minimal ; then
700 docinto "support-files" 749 docinto "support-files"
701 for script in \ 750 for script in \
702 support-files/my-*.cnf \ 751 "${S}"/support-files/my-*.cnf \
703 support-files/magic \ 752 "${S}"/support-files/magic \
704 support-files/ndb-config-2-node.ini 753 "${S}"/support-files/ndb-config-2-node.ini
705 do 754 do
706 dodoc "${script}" 755 dodoc "${script}"
707 done 756 done
708 757
709 docinto "scripts" 758 docinto "scripts"
710 for script in scripts/mysql* ; do 759 for script in "${S}"/scripts/mysql* ; do
711 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 760 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
712 done 761 done
713 762
714 fi 763 fi
715 764
819 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 868 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
820 || touch "${TMPDIR}/fill_help_tables.sql" 869 || touch "${TMPDIR}/fill_help_tables.sql"
821 help_tables="${TMPDIR}/fill_help_tables.sql" 870 help_tables="${TMPDIR}/fill_help_tables.sql"
822 871
823 pushd "${TMPDIR}" &>/dev/null 872 pushd "${TMPDIR}" &>/dev/null
824 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 873 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
874 if [ $? -ne 0 ]; then
875 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
876 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
877 fi
825 popd &>/dev/null 878 popd &>/dev/null
826 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 879 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
827 || die "MySQL databases not installed" 880 || die "MySQL databases not installed"
828 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null 881 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
829 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null 882 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
830 883
831 if mysql_version_is_at_least "4.1.3" ; then 884 if mysql_version_is_at_least "4.1.3" ; then
832 options="--skip-ndbcluster" 885 options="--skip-ndbcluster"
833 886
834 # Filling timezones, see 887 # Filling timezones, see

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20