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

Diff of /eclass/mysql.eclass

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

Revision 1.103 Revision 1.111
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/Attic/mysql.eclass,v 1.103 2009/01/12 23:08:17 maekke Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.111 2009/07/06 18:21:18 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: MySQL Team <mysql-bugs@gentoo.org>
7# - Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
8# - Robin H. Johnson <robbat2@gentoo.org> 8# - Robin H. Johnson <robbat2@gentoo.org>
9 9
10WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
11WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
12 12
13inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
14 14
15# 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
16# and we will run a mysql server during test phase 16# and we will run a mysql server during test phase
17S="${WORKDIR}/mysql" 17S="${WORKDIR}/mysql"
18 18
19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21 EGIT_PROJECT=mysql-extras 21 EGIT_PROJECT=mysql-extras
22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23 inherit git 23 inherit git
24fi
25
26if [[ ${PR#r} -lt 60 ]] ; then
27 IS_BITKEEPER=0
28elif [[ ${PR#r} -lt 90 ]] ; then
29 IS_BITKEEPER=60
30else
31 IS_BITKEEPER=90
32fi 24fi
33 25
34# MYSQL_VERSION_ID will be: 26# MYSQL_VERSION_ID will be:
35# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 27# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
36# This is an important part, because many of the choices the MySQL ebuild will do 28# This is an important part, because many of the choices the MySQL ebuild will do
47 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 39 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
48done 40done
49# strip leading "0" (otherwise it's considered an octal number by BASH) 41# strip leading "0" (otherwise it's considered an octal number by BASH)
50MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 42MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
51 43
44# Community features are available in mysql-community
45# AND in the re-merged mysql-5.0.82 and newer
46if [ "${PN}" == "mysql-community" ]; then
47 MYSQL_COMMUNITY_FEATURES=1
48elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
49 MYSQL_COMMUNITY_FEATURES=1
50else
51 MYSQL_COMMUNITY_FEATURES=0
52fi
53
52# Be warned, *DEPEND are version-dependant 54# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime 55# These are used for both runtime and compiletime
54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 56DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
55 userland_GNU? ( sys-process/procps ) 57 userland_GNU? ( sys-process/procps )
56 >=sys-apps/sed-4 58 >=sys-apps/sed-4
72mysql_version_is_at_least "5.1" \ 74mysql_version_is_at_least "5.1" \
73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 75|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
74 76
75# compile-time-only 77# compile-time-only
76mysql_version_is_at_least "5.1.12" \ 78mysql_version_is_at_least "5.1.12" \
77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 79&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
78
79# BitKeeper dependency, compile-time only
80[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
81
82 80
83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 81# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 82PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
83
84# For other stuff to bring us in
85PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
85 86
86# Work out the default SERVER_URI correctly 87# Work out the default SERVER_URI correctly
87if [ -z "${SERVER_URI}" ]; then 88if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors 89 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then 90 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 91 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only 92 # The (old) enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then 93 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 94 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi 95 fi
95fi 96fi
96 97
121 122
122mysql_version_is_at_least "5.0.18" \ 123mysql_version_is_at_least "5.0.18" \
123&& IUSE="${IUSE} max-idx-128" 124&& IUSE="${IUSE} max-idx-128"
124 125
125mysql_version_is_at_least "5.1" \ 126mysql_version_is_at_least "5.1" \
126&& IUSE="${IUSE} innodb"
127
128mysql_version_is_at_least "5.1" \
129|| IUSE="${IUSE} berkdb" 127|| IUSE="${IUSE} berkdb"
130 128
131mysql_version_is_at_least "5.1.12" \ 129mysql_version_is_at_least "5.1.12" \
132&& IUSE="${IUSE} pbxt" 130&& IUSE="${IUSE} pbxt"
131
132[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
133&& IUSE="${IUSE} community profiling"
133 134
134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 135EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
135 pkg_postinst pkg_config pkg_postrm 136 pkg_postinst pkg_config pkg_postrm
136 137
137# 138#
138# HELPER FUNCTIONS: 139# HELPER FUNCTIONS:
139# 140#
140
141bitkeeper_fetch() {
142 local reposuf
143 if [[ -z "${1}" ]] ; then
144 local tpv
145 tpv=( ${PV//[-._]/ } )
146 reposuf="mysql-${tpv[0]}.${tpv[1]}"
147 else
148 reposuf="${1}"
149 fi
150 einfo "Using '${reposuf}' repository."
151 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
152 ## -- ebk_store_dir: bitkeeper sources store directory
153 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
154 ## -- ebk_fetch_cmd: bitkeeper fetch command
155 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
156 # hint: does not work
157 local ebk_fetch_cmd="sfioball"
158 ## -- ebk_update_cmd: bitkeeper update command
159 local ebk_update_cmd="update"
160
161 # addread "/etc/bitkeeper"
162 addwrite "${ebk_store_dir}"
163
164 if [[ ! -d "${ebk_store_dir}" ]] ; then
165 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
166 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
167 fi
168
169 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
170
171 local wc_path=${reposuf}
172
173 if [[ ! -d "${wc_path}" ]] ; then
174 local options="-r+"
175
176 # first checkout
177 einfo "bitkeeper checkout start -->"
178 einfo " repository: ${repo_uri}"
179
180 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
181 || die "BK: couldn't fetch from ${repo_uri}"
182 else
183 if [[ ! -d "${wc_path}/BK" ]] ; then
184 popd
185 die "Looks like ${wc_path} is not a bitkeeper path"
186 fi
187
188 # update working copy
189 einfo "bitkeeper update start -->"
190 einfo " repository: ${repo_uri}"
191
192 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
193 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
194 fi
195
196 einfo " working copy: ${wc_path}"
197 cd "${wc_path}"
198 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
199
200 echo
201 popd
202}
203 141
204mysql_disable_test() { 142mysql_disable_test() {
205 local testname="${1}" ; shift 143 local testname="${1}" ; shift
206 local reason="${@}" 144 local reason="${@}"
207 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 145 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
248 PREVIOUS_DATADIR="yes" 186 PREVIOUS_DATADIR="yes"
249 else 187 else
250 PREVIOUS_DATADIR="no" 188 PREVIOUS_DATADIR="no"
251 fi 189 fi
252 export PREVIOUS_DATADIR 190 export PREVIOUS_DATADIR
191 fi
192 else
193 if [[ ${EBUILD_PHASE} == "config" ]]; then
194 local new_MY_DATADIR
195 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
196 | sed -ne '/datadir/s|^--datadir=||p' \
197 | tail -n1`
198
199 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
200 ewarn "MySQL MY_DATADIR has changed"
201 ewarn "from ${MY_DATADIR}"
202 ewarn "to ${new_MY_DATADIR}"
203 MY_DATADIR="${new_MY_DATADIR}"
204 fi
253 fi 205 fi
254 fi 206 fi
255 207
256 MY_SOURCEDIR=${SERVER_URI##*/} 208 MY_SOURCEDIR=${SERVER_URI##*/}
257 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 209 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
403 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 355 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
404 myconf="${myconf} --with-federated-storage-engine" 356 myconf="${myconf} --with-federated-storage-engine"
405 fi 357 fi
406 fi 358 fi
407 359
408 if [ "${PN}" == "mysql-community" ]; then 360 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
409 myconf="${myconf} --enable-community-features" 361 myconf="${myconf} `use_enable community community-features`"
362 if use community; then
363 myconf="${myconf} `use_enable profiling`"
364 else
365 myconf="${myconf} --disable-profiling"
366 fi
410 fi 367 fi
411 368
412 mysql_version_is_at_least "5.0.18" \ 369 mysql_version_is_at_least "5.0.18" \
413 && use max-idx-128 \ 370 && use max-idx-128 \
414 && myconf="${myconf} --with-max-indexes=128" 371 && myconf="${myconf} --with-max-indexes=128"
436 393
437 elog "Before using the Federated storage engine, please be sure to read" 394 elog "Before using the Federated storage engine, please be sure to read"
438 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 395 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
439 fi 396 fi
440 397
441 if use innodb ; then 398 # Upstream specifically requests that InnoDB always be built.
442 plugins="${plugins},innobase" 399 plugins="${plugins},innobase"
443 fi
444 400
445 # like configuration=max-no-ndb 401 # like configuration=max-no-ndb
446 if use cluster ; then 402 if use cluster ; then
447 plugins="${plugins},ndbcluster" 403 plugins="${plugins},ndbcluster"
448 myconf="${myconf} --with-ndb-binlog" 404 myconf="${myconf} --with-ndb-binlog"
528 mysql_init_vars 484 mysql_init_vars
529 485
530 unpack ${A} 486 unpack ${A}
531 # Grab the patches 487 # Grab the patches
532 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack 488 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
533 # Bitkeeper checkout support 489
534 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
535 if mysql_check_version_range "5.1 to 5.1.99" ; then
536 bitkeeper_fetch "mysql-5.1-ndb"
537 elif mysql_check_version_range "5.2 to 5.2.99" ; then
538 bitkeeper_fetch "mysql-5.2-falcon"
539 else
540 bitkeeper_fetch
541 fi
542 cd "${S}"
543 einfo "Running upstream autorun over BK sources ..."
544 BUILD/autorun.sh
545 else
546 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 490 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
547 cd "${S}" 491 cd "${S}"
548 fi
549 492
550 # Apply the patches for this MySQL version 493 # Apply the patches for this MySQL version
551 EPATCH_SUFFIX="patch" 494 EPATCH_SUFFIX="patch"
552 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 495 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
553 # Clean out old items 496 # Clean out old items
579 local rebuilddirlist d 522 local rebuilddirlist d
580 523
581 if mysql_version_is_at_least "5.1.12" ; then 524 if mysql_version_is_at_least "5.1.12" ; then
582 rebuilddirlist="." 525 rebuilddirlist="."
583 # TODO: check this with a cmake expert 526 # TODO: check this with a cmake expert
584 use innodb \
585 && cmake \ 527 cmake \
586 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 528 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
587 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 529 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
588 "storage/innobase" 530 "storage/innobase"
589 else 531 else
590 rebuilddirlist=". innobase" 532 rebuilddirlist=". innobase"
682 624
683 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 625 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
684 626
685 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 627 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
686 628
687 insinto "${MY_INCLUDEDIR}"
688 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
689
690 # Convenience links 629 # Convenience links
630 einfo "Making Convenience links for mysqlcheck multi-call binary"
691 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 631 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
692 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 632 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
693 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 633 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
694 634
695 # Various junk (my-*.cnf moved elsewhere) 635 # Various junk (my-*.cnf moved elsewhere)
636 einfo "Removing duplicate /usr/share/mysql files"
696 rm -Rf "${D}/usr/share/info" 637 rm -Rf "${D}/usr/share/info"
697 for removeme in "mysql-log-rotate" mysql.server* \ 638 for removeme in "mysql-log-rotate" mysql.server* \
698 binary-configure* my-*.cnf mi_test_all* 639 binary-configure* my-*.cnf mi_test_all*
699 do 640 do
700 rm -f "${D}"/usr/share/mysql/${removeme} 641 rm -f "${D}"/usr/share/mysql/${removeme}
701 done 642 done
702 643
703 # Clean up stuff for a minimal build 644 # Clean up stuff for a minimal build
704 if use minimal ; then 645 if use minimal ; then
646 einfo "Remove all extra content for minimal build"
705 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 647 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
706 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 648 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
707 rm -f "${D}/usr/sbin/mysqld" 649 rm -f "${D}/usr/sbin/mysqld"
708 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 650 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
709 fi 651 fi
712 if mysql_version_is_at_least "4.1" ; then 654 if mysql_version_is_at_least "4.1" ; then
713 mysql_mycnf_version="4.1" 655 mysql_mycnf_version="4.1"
714 else 656 else
715 mysql_mycnf_version="4.0" 657 mysql_mycnf_version="4.0"
716 fi 658 fi
659 einfo "Building default my.cnf"
717 insinto "${MY_SYSCONFDIR}" 660 insinto "${MY_SYSCONFDIR}"
718 doins scripts/mysqlaccess.conf 661 doins scripts/mysqlaccess.conf
719 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 662 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
720 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 663 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
721 > "${TMPDIR}/my.cnf.ok" 664 > "${TMPDIR}/my.cnf.ok"
724 fi 667 fi
725 newins "${TMPDIR}/my.cnf.ok" my.cnf 668 newins "${TMPDIR}/my.cnf.ok" my.cnf
726 669
727 # Minimal builds don't have the MySQL server 670 # Minimal builds don't have the MySQL server
728 if ! use minimal ; then 671 if ! use minimal ; then
672 einfo "Creating initial directories"
729 # Empty directories ... 673 # Empty directories ...
730 diropts "-m0750" 674 diropts "-m0750"
731 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 675 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
732 dodir "${MY_DATADIR}" 676 dodir "${MY_DATADIR}"
733 keepdir "${MY_DATADIR}" 677 keepdir "${MY_DATADIR}"
741 chown -R mysql:mysql "${D}/${folder}" 685 chown -R mysql:mysql "${D}/${folder}"
742 done 686 done
743 fi 687 fi
744 688
745 # Docs 689 # Docs
690 einfo "Installing docs"
746 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 691 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
747 doinfo "${S}"/Docs/mysql.info 692 doinfo "${S}"/Docs/mysql.info
748 693
749 # Minimal builds don't have the MySQL server 694 # Minimal builds don't have the MySQL server
750 if ! use minimal ; then 695 if ! use minimal ; then
696 einfo "Including support files and sample configurations"
751 docinto "support-files" 697 docinto "support-files"
752 for script in \ 698 for script in \
753 "${S}"/support-files/my-*.cnf \ 699 "${S}"/support-files/my-*.cnf \
754 "${S}"/support-files/magic \ 700 "${S}"/support-files/magic \
755 "${S}"/support-files/ndb-config-2-node.ini 701 "${S}"/support-files/ndb-config-2-node.ini
826 && use berkdb \ 772 && use berkdb \
827 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 773 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
828} 774}
829 775
830mysql_pkg_config() { 776mysql_pkg_config() {
777 local old_MY_DATADIR="${MY_DATADIR}"
778
831 # Make sure the vars are correctly initialized 779 # Make sure the vars are correctly initialized
832 mysql_init_vars 780 mysql_init_vars
833 781
834 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 782 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
835 783
836 if built_with_use ${CATEGORY}/${PN} minimal ; then 784 if built_with_use ${CATEGORY}/${PN} minimal ; then
837 die "Minimal builds do NOT include the MySQL server" 785 die "Minimal builds do NOT include the MySQL server"
786 fi
787
788 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
789 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
790 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
791
792 if [[ -d "${old_MY_DATADIR_s}" ]]; then
793 if [[ -d "${MY_DATADIR_s}" ]]; then
794 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
795 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
796 else
797 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
798 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
799 || die "Moving MY_DATADIR failed"
800 fi
801 else
802 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
803 if [[ -d "${MY_DATADIR_s}" ]]; then
804 ewarn "Attempting to use ${MY_DATADIR_s}"
805 else
806 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
807 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
808 fi
809 fi
838 fi 810 fi
839 811
840 local pwd1="a" 812 local pwd1="a"
841 local pwd2="b" 813 local pwd2="b"
842 local maxtry=5 814 local maxtry=5

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.111

  ViewVC Help
Powered by ViewVC 1.1.20