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

Diff of /eclass/mysql.eclass

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

Revision 1.77 Revision 1.98
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.77 2007/05/09 21:14:22 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.98 2008/11/14 01:46:24 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 85
69# BitKeeper dependency, compile-time only 86# Work out the default SERVER_URI correctly
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 87if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi
95fi
71 96
72# Define correct SRC_URIs 97# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 98SRC_URI="${SERVER_URI}"
99
100[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
74 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 101 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
75 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 102 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
76mysql_version_is_at_least "5.1.12" \ 103mysql_version_is_at_least "5.1.12" \
77&& [[ -n "${PBXT_VERSION}" ]] \ 104&& [[ -n "${PBXT_VERSION}" ]] \
78&& 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 )"
80DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 107DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
81HOMEPAGE="http://www.mysql.com/" 108HOMEPAGE="http://www.mysql.com/"
82LICENSE="GPL-2" 109LICENSE="GPL-2"
83SLOT="0" 110SLOT="0"
84IUSE="big-tables debug embedded minimal perl selinux ssl static" 111IUSE="big-tables debug embedded minimal perl selinux ssl static"
85RESTRICT="confcache"
86 112
87mysql_version_is_at_least "4.1" \ 113mysql_version_is_at_least "4.1" \
88&& IUSE="${IUSE} latin1" 114&& IUSE="${IUSE} latin1"
89 115
90mysql_version_is_at_least "4.1.3" \ 116mysql_version_is_at_least "4.1.3" \
102mysql_version_is_at_least "5.1" \ 128mysql_version_is_at_least "5.1" \
103|| IUSE="${IUSE} berkdb" 129|| IUSE="${IUSE} berkdb"
104 130
105mysql_version_is_at_least "5.1.12" \ 131mysql_version_is_at_least "5.1.12" \
106&& IUSE="${IUSE} pbxt" 132&& IUSE="${IUSE} pbxt"
107
108RDEPEND="${DEPEND}
109 !minimal? ( dev-db/mysql-init-scripts )
110 selinux? ( sec-policy/selinux-mysql )"
111 133
112EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
113 pkg_postinst pkg_config pkg_postrm 135 pkg_postinst pkg_config pkg_postrm
114 136
115# 137#
206 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 228 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
207 | sed -ne '/datadir/s|^--datadir=||p' \ 229 | sed -ne '/datadir/s|^--datadir=||p' \
208 | tail -n1` 230 | tail -n1`
209 if [[ -z "${MY_DATADIR}" ]] ; then 231 if [[ -z "${MY_DATADIR}" ]] ; then
210 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 232 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
211 | sed -e 's/.*=\s*//'` 233 | sed -e 's/.*=\s*//' \
234 | tail -n1`
212 fi 235 fi
213 fi 236 fi
214 if [[ -z "${MY_DATADIR}" ]] ; then 237 if [[ -z "${MY_DATADIR}" ]] ; then
215 MY_DATADIR="${MY_LOCALSTATEDIR}" 238 MY_DATADIR="${MY_LOCALSTATEDIR}"
216 einfo "Using default MY_DATADIR" 239 einfo "Using default MY_DATADIR"
217 fi 240 fi
218 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 241 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
219 242
220 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
221 if [[ -e "${MY_DATADIR}" ]] ; then 244 if [[ -e "${MY_DATADIR}" ]] ; then
222 elog "Previous datadir found, it's YOUR job to change" 245 # If you get this and you're wondering about it, see bug #207636
223 elog "ownership and take care of it" 246 elog "MySQL datadir found in ${MY_DATADIR}"
247 elog "A new one will not be created."
224 PREVIOUS_DATADIR="yes" 248 PREVIOUS_DATADIR="yes"
225 else 249 else
226 PREVIOUS_DATADIR="no" 250 PREVIOUS_DATADIR="no"
227 fi 251 fi
228 export PREVIOUS_DATADIR 252 export PREVIOUS_DATADIR
239 263
240configure_minimal() { 264configure_minimal() {
241 # These are things we exclude from a minimal build, please 265 # These are things we exclude from a minimal build, please
242 # note that the server actually does get built and installed, 266 # note that the server actually does get built and installed,
243 # but we then delete it before packaging. 267 # but we then delete it before packaging.
244 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 268 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
245 269
246 for i in ${minimal_exclude_list} ; do 270 for i in ${minimal_exclude_list} ; do
247 myconf="${myconf} --without-${i}" 271 myconf="${myconf} --without-${i}"
248 done 272 done
249 myconf="${myconf} --with-extra-charsets=none" 273 myconf="${myconf} --with-extra-charsets=none"
250 myconf="${myconf} --enable-local-infile" 274 myconf="${myconf} --enable-local-infile"
251 275
252 if use static ; then 276 if use static ; then
253 myconf="${myconf} --with-client-ldflags=-all-static" 277 myconf="${myconf} --with-client-ldflags=-all-static"
254 myconf="${myconf} --disable-shared" 278 myconf="${myconf} --disable-shared --with-pic"
255 else 279 else
256 myconf="${myconf} --enable-shared --enable-static" 280 myconf="${myconf} --enable-shared --enable-static"
257 fi 281 fi
258 282
259 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 283 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
275 myconf="${myconf} --without-libwrap" 299 myconf="${myconf} --without-libwrap"
276 300
277 if use static ; then 301 if use static ; then
278 myconf="${myconf} --with-mysqld-ldflags=-all-static" 302 myconf="${myconf} --with-mysqld-ldflags=-all-static"
279 myconf="${myconf} --with-client-ldflags=-all-static" 303 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 304 myconf="${myconf} --disable-shared --with-pic"
281 else 305 else
282 myconf="${myconf} --enable-shared --enable-static" 306 myconf="${myconf} --enable-shared --enable-static"
283 fi 307 fi
284 308
285 if use debug ; then 309 if use debug ; then
326 if mysql_version_is_at_least "5.1.11" ; then 350 if mysql_version_is_at_least "5.1.11" ; then
327 myconf="${myconf} $(use_with ssl)" 351 myconf="${myconf} $(use_with ssl)"
328 else 352 else
329 myconf="${myconf} $(use_with ssl openssl)" 353 myconf="${myconf} $(use_with ssl openssl)"
330 fi 354 fi
331 355
356 if mysql_version_is_at_least "5.0.60" ; then
332 if use berkdb ; then 357 if use berkdb ; then
358 elog "Berkeley DB support was disabled due to build failures"
359 elog "on multiple arches, go to a version earlier than 5.0.60"
360 elog "if you want it again. Gentoo bug #224067."
361 fi
362 myconf="${myconf} --without-berkeley-db"
363 elif use berkdb ; then
333 # The following fix is due to a bug with bdb on SPARC's. See: 364 # The following fix is due to a bug with bdb on SPARC's. See:
334 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 365 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
335 # It comes down to non-64-bit safety problems. 366 # It comes down to non-64-bit safety problems.
336 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 367 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
337 elog "Berkeley DB support was disabled due to compatibility issues on this arch" 368 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
441} 472}
442 473
443# 474#
444# EBUILD FUNCTIONS 475# EBUILD FUNCTIONS
445# 476#
446
447mysql_pkg_setup() { 477mysql_pkg_setup() {
448 enewgroup mysql 60 || die "problem adding 'mysql' group" 478 if hasq test ${FEATURES} ; then
449 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 479 if ! use minimal ; then
480 if [[ $UID -eq 0 ]]; then
481 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
482 fi
483 fi
484 fi
485
486 # Bug #213475 - MySQL _will_ object strenously if your machine is named
487 # localhost. Also causes weird failures.
488 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
450 489
451 # Check for USE flag problems in pkg_setup 490 # Check for USE flag problems in pkg_setup
452 if use static && use ssl ; then 491 if use static && use ssl ; then
453 eerror "MySQL does not support being built statically with SSL support enabled!" 492 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!" 493 die "MySQL does not support being built statically with SSL support enabled!"
466 && ( use cluster || use extraengine ) \ 505 && ( use cluster || use extraengine ) \
467 && use minimal ; then 506 && use minimal ; then
468 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 507 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 508 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
470 fi 509 fi
510
511 # This should come after all of the die statements
512 enewgroup mysql 60 || die "problem adding 'mysql' group"
513 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
471 514
472 mysql_check_version_range "4.0 to 5.0.99.99" \ 515 mysql_check_version_range "4.0 to 5.0.99.99" \
473 && use berkdb \ 516 && use berkdb \
474 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 517 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
475} 518}
477mysql_src_unpack() { 520mysql_src_unpack() {
478 # Initialize the proper variables first 521 # Initialize the proper variables first
479 mysql_init_vars 522 mysql_init_vars
480 523
481 unpack ${A} 524 unpack ${A}
525 # Grab the patches
526 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
527 # Bitkeeper checkout support
482 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 528 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
483 if mysql_check_version_range "5.1 to 5.1.99" ; then 529 if mysql_check_version_range "5.1 to 5.1.99" ; then
484 bitkeeper_fetch "mysql-5.1-ndb" 530 bitkeeper_fetch "mysql-5.1-ndb"
485 elif mysql_check_version_range "5.2 to 5.2.99" ; then 531 elif mysql_check_version_range "5.2 to 5.2.99" ; then
486 bitkeeper_fetch "mysql-5.2-falcon" 532 bitkeeper_fetch "mysql-5.2-falcon"
496 fi 542 fi
497 543
498 # Apply the patches for this MySQL version 544 # Apply the patches for this MySQL version
499 EPATCH_SUFFIX="patch" 545 EPATCH_SUFFIX="patch"
500 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 546 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
547 # Clean out old items
548 rm -f "${EPATCH_SOURCE}"/*
549 # Now link in right patches
501 mysql_mv_patches 550 mysql_mv_patches
551 # And apply
502 epatch 552 epatch
503 553
504 # Additional checks, remove bundled zlib 554 # Additional checks, remove bundled zlib
505 rm -f "${S}/zlib/"*.[ch] 555 rm -f "${S}/zlib/"*.[ch]
506 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 556 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
526 rebuilddirlist="." 576 rebuilddirlist="."
527 # TODO: check this with a cmake expert 577 # TODO: check this with a cmake expert
528 use innodb \ 578 use innodb \
529 && cmake \ 579 && cmake \
530 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 580 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
531 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 581 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
532 "storage/innobase" 582 "storage/innobase"
533 else 583 else
534 rebuilddirlist=". innobase" 584 rebuilddirlist=". innobase"
535 fi 585 fi
536 586
544 if mysql_check_version_range "4.1 to 5.0.99.99" \ 594 if mysql_check_version_range "4.1 to 5.0.99.99" \
545 && use berkdb ; then 595 && use berkdb ; then
546 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 596 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
547 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 597 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
548 || die "Could not copy libtool.m4 to bdb/dist/" 598 || die "Could not copy libtool.m4 to bdb/dist/"
599 #These files exist only with libtool-2*, and need to be included.
600 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
601 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
602 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
603 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
604 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
605 fi
549 pushd "bdb/dist" &>/dev/null 606 pushd "bdb/dist" &>/dev/null
550 sh s_all \ 607 sh s_all \
551 || die "Failed bdb reconfigure" 608 || die "Failed bdb reconfigure"
552 popd &>/dev/null 609 popd &>/dev/null
553 fi 610 fi
673 done 730 done
674 fi 731 fi
675 732
676 # Docs 733 # Docs
677 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 734 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
735 doinfo "${S}"/Docs/mysql.info
678 736
679 # Minimal builds don't have the MySQL server 737 # Minimal builds don't have the MySQL server
680 if ! use minimal ; then 738 if ! use minimal ; then
681 docinto "support-files" 739 docinto "support-files"
682 for script in \ 740 for script in \
683 support-files/my-*.cnf \ 741 "${S}"/support-files/my-*.cnf \
684 support-files/magic \ 742 "${S}"/support-files/magic \
685 support-files/ndb-config-2-node.ini 743 "${S}"/support-files/ndb-config-2-node.ini
686 do 744 do
687 dodoc "${script}" 745 dodoc "${script}"
688 done 746 done
689 747
690 docinto "scripts" 748 docinto "scripts"
691 for script in scripts/mysql* ; do 749 for script in "${S}"/scripts/mysql* ; do
692 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 750 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
693 done 751 done
752
694 fi 753 fi
695 754
696 mysql_lib_symlinks "${D}" 755 mysql_lib_symlinks "${D}"
697} 756}
698 757
799 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 858 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
800 || touch "${TMPDIR}/fill_help_tables.sql" 859 || touch "${TMPDIR}/fill_help_tables.sql"
801 help_tables="${TMPDIR}/fill_help_tables.sql" 860 help_tables="${TMPDIR}/fill_help_tables.sql"
802 861
803 pushd "${TMPDIR}" &>/dev/null 862 pushd "${TMPDIR}" &>/dev/null
804 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 863 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
864 if [ $? -ne 0 ]; then
865 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
866 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
867 fi
805 popd &>/dev/null 868 popd &>/dev/null
806 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 869 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
807 || die "MySQL databases not installed" 870 || die "MySQL databases not installed"
808 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null 871 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null 872 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
810 873
811 if mysql_version_is_at_least "4.1.3" ; then 874 if mysql_version_is_at_least "4.1.3" ; then
812 options="--skip-ndbcluster" 875 options="--skip-ndbcluster"
813 876
814 # Filling timezones, see 877 # Filling timezones, see

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20