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

Diff of /eclass/mysql.eclass

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

Revision 1.142 Revision 1.147
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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.142 2010/03/24 20:37:54 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.147 2010/08/08 23:31:05 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
152# Work out the default SERVER_URI correctly 152# Work out the default SERVER_URI correctly
153if [ -z "${SERVER_URI}" ]; then 153if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 155 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
157 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
158 SERVER_URI="
159 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
160 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
157 SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz" 161 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
162 "
158 # The community build is on the mirrors 163 # The community build is on the mirrors
159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 164 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" 165 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
161 # The (old) enterprise source is on the primary site only 166 # The (old) enterprise source is on the primary site only
162 elif [ "${PN}" == "mysql" ]; then 167 elif [ "${PN}" == "mysql" ]; then
232 && mysql_version_is_at_least "5.1.26" \ 237 && mysql_version_is_at_least "5.1.26" \
233 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 238 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
234 return $? 239 return $?
235} 240}
236 241
242
237pbxt_patch_available \ 243pbxt_patch_available \
238&& PBXT_P="pbxt-${PBXT_VERSION}" \ 244&& PBXT_P="pbxt-${PBXT_VERSION}" \
239&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ 245&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
240&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \ 246&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
241 247
248# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
249# vs. built outside the dir
242pbxt_available \ 250pbxt_available \
243&& IUSE="${IUSE} pbxt" 251&& IUSE="${IUSE} pbxt" \
252&& mysql_version_is_at_least "5.1.40" \
253&& PBXT_NEWSTYLE=1
244 254
245xtradb_patch_available \ 255xtradb_patch_available \
246&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 256&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
247&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 257&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
248&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \ 258&& XTRADB_SRC_B1="http://www.percona.com/" \
259&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
260&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
249&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \ 261&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
262&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
250&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \ 263&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
251&& IUSE="${IUSE} xtradb" 264&& IUSE="${IUSE} xtradb"
252 265
253# 266#
254# HELPER FUNCTIONS: 267# HELPER FUNCTIONS:
255# 268#
352 MY_DATADIR="${new_MY_DATADIR}" 365 MY_DATADIR="${new_MY_DATADIR}"
353 fi 366 fi
354 fi 367 fi
355 fi 368 fi
356 369
370 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
357 MY_SOURCEDIR=${SERVER_URI##*/} 371 MY_SOURCEDIR=${SERVER_URI##*/}
358 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 372 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
373 fi
359 374
360 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 375 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
361 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 376 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
362 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 377 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
363} 378}
524 myconf="${myconf} --enable-assembler" 539 myconf="${myconf} --enable-assembler"
525 myconf="${myconf} --with-geometry" 540 myconf="${myconf} --with-geometry"
526 myconf="${myconf} --with-readline" 541 myconf="${myconf} --with-readline"
527 myconf="${myconf} --with-zlib-dir=/usr/" 542 myconf="${myconf} --with-zlib-dir=/usr/"
528 myconf="${myconf} --without-pstack" 543 myconf="${myconf} --without-pstack"
544 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
545
529 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 546 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
530 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 547 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
531 myconf="${myconf} $(use_enable community community-features)" 548 myconf="${myconf} $(use_enable community community-features)"
532 if use community; then 549 if use community; then
533 myconf="${myconf} $(use_enable profiling)" 550 myconf="${myconf} $(use_enable profiling)"
534 else 551 else
535 myconf="${myconf} --disable-profiling" 552 myconf="${myconf} --disable-profiling"
536 fi 553 fi
537 fi 554 fi
538 555
556 # Scan for all available plugins
557 local plugins_avail="$(
558 LANG=C \
559 find "${S}" \
560 \( \
561 -name 'plug.in' \
562 -o -iname 'configure.in' \
563 -o -iname 'configure.ac' \
564 \) \
565 -print0 \
566 | xargs -0 sed -r -n \
567 -e '/^MYSQL_STORAGE_ENGINE/{
568 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
569 s~^([^ ]+).*~\1~gp;
570 }' \
571 | tr -s '\n' ' '
572 )"
573
539 # 5.1 introduces a new way to manage storage engines (plugins) 574 # 5.1 introduces a new way to manage storage engines (plugins)
540 # like configuration=none 575 # like configuration=none
541 # This base set are required, and will always be statically built. 576 # This base set are required, and will always be statically built.
542 local plugins="csv,myisam,myisammrg,heap" 577 local plugins_sta="csv myisam myisammrg heap"
578 local plugins_dyn=""
579 local plugins_dis="example ibmdb2i"
580
581 # These aren't actually required by the base set, but are really useful:
582 plugins_sta="${plugins_sta} archive blackhole"
583
584 # default in 5.5.4
585 if mysql_version_is_at_least "5.5.4" ; then
586 plugins_sta="${plugins_sta} partition"
587 fi
588 # Now the extras
543 if use extraengine ; then 589 if use extraengine ; then
544 # like configuration=max-no-ndb, archive and example removed in 5.1.11 590 # like configuration=max-no-ndb, archive and example removed in 5.1.11
545 # not added yet: ibmdb2i 591 # not added yet: ibmdb2i
546 # Not supporting as examples: example,daemon_example,ftexample 592 # Not supporting as examples: example,daemon_example,ftexample
547 plugins="${plugins},archive,blackhole,federated,partition" 593 plugins_sta="${plugins_sta} partition"
594 plugins_dyn="${plugins_sta} federated"
548 595
549 if [[ "${PN}" != "mariadb" ]] ; then 596 if [[ "${PN}" != "mariadb" ]] ; then
550 elog "Before using the Federated storage engine, please be sure to read" 597 elog "Before using the Federated storage engine, please be sure to read"
551 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 598 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
552 else 599 else
553 elog "MariaDB includes the FederatedX engine. Be sure to read" 600 elog "MariaDB includes the FederatedX engine. Be sure to read"
554 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 601 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
555 fi 602 fi
603 else
604 plugins_dis="${plugins_dis} partition federated"
556 fi 605 fi
557 606
558 # Upstream specifically requests that InnoDB always be built: 607 # Upstream specifically requests that InnoDB always be built:
559 # - innobase, innodb_plugin 608 # - innobase, innodb_plugin
560 # Build falcon if available for 6.x series. 609 # Build falcon if available for 6.x series.
561 for i in innobase innodb_plugin falcon ; do 610 for i in innobase falcon ; do
562 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 611 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
612 done
613 for i in innodb_plugin ; do
614 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
563 done 615 done
564 616
565 # like configuration=max-no-ndb 617 # like configuration=max-no-ndb
566 if use cluster ; then 618 if use cluster ; then
567 plugins="${plugins},ndbcluster" 619 plugins_sta="${plugins_sta} ndbcluster partition"
620 plugins_dis="${plugins_dis//partition}"
568 myconf="${myconf} --with-ndb-binlog" 621 myconf="${myconf} --with-ndb-binlog"
622 else
623 plugins_dis="${plugins_dis} ndbcluster"
569 fi 624 fi
570 625
571 if [[ "${PN}" == "mariadb" ]] ; then 626 if [[ "${PN}" == "mariadb" ]] ; then
572 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 627 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
573 # caught above. 628 # caught above.
574 plugins="${plugins},maria,innobase" 629 plugins_sta="${plugins_sta} maria innobase"
575 if use pbxt ; then
576 plugins="${plugins},pbxt"
577 else
578 myconf="${myconf} --without-plugin-pbxt"
579 fi
580 myconf="${myconf} $(use_with libevent)" 630 myconf="${myconf} $(use_with libevent)"
581 # This is not optional, without it several upstream testcases fail. 631 # This is not optional, without it several upstream testcases fail.
582 # Also strongly recommended by upstream. 632 # Also strongly recommended by upstream.
583 myconf="${myconf} --with-maria-tmp-tables" 633 myconf="${myconf} --with-maria-tmp-tables"
584 fi 634 fi
635
636 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
637 use pbxt \
638 && plugins_dyn="${plugins_dyn} pbxt" \
639 || plugins_dis="${plugins_dis} pbxt"
640 fi
585 641
642 use static && \
643 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
644 plugins_dyn=""
645
646 einfo "Available plugins: ${plugins_avail}"
647 einfo "Dynamic plugins: ${plugins_dyn}"
648 einfo "Static plugins: ${plugins_sta}"
649 einfo "Disabled plugins: ${plugins_dis}"
650
651 # These are the static plugins
586 myconf="${myconf} --with-plugins=${plugins}" 652 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
653 # And the disabled ones
654 for i in ${plugins_dis} ; do
655 myconf="${myconf} --without-plugin-${i}"
656 done
587} 657}
588 658
589pbxt_src_configure() { 659pbxt_src_configure() {
590 mysql_init_vars 660 mysql_init_vars
591 661
599 use debug && myconf="${myconf} --with-debug=full" 669 use debug && myconf="${myconf} --with-debug=full"
600 econf ${myconf} || die "Problem configuring PBXT storage engine" 670 econf ${myconf} || die "Problem configuring PBXT storage engine"
601} 671}
602 672
603pbxt_src_compile() { 673pbxt_src_compile() {
674
604 # Be backwards compatible for now 675 # Be backwards compatible for now
605 if [[ $EAPI != 2 ]]; then 676 if [[ $EAPI != 2 ]]; then
606 pbxt_src_configure 677 pbxt_src_configure
607 fi 678 fi
608 # TODO: is it safe/needed to use emake here ? 679 # TODO: is it safe/needed to use emake here ?
637 fi 708 fi
638 fi 709 fi
639 710
640 # Check for USE flag problems in pkg_setup 711 # Check for USE flag problems in pkg_setup
641 if use static && use ssl ; then 712 if use static && use ssl ; then
642 eerror "MySQL does not support being built statically with SSL support enabled!"
643 die "MySQL does not support being built statically with SSL support enabled!" 713 M="MySQL does not support being built statically with SSL support enabled!"
714 eerror "${M}"
715 die "${M}"
644 fi 716 fi
645 717
646 if ! mysql_version_is_at_least "5.0" \ 718 if ! mysql_version_is_at_least "5.0" \
647 && use raid \ 719 && use raid \
648 && use static ; then 720 && use static ; then
650 eerror "with RAID support enabled." 722 eerror "with RAID support enabled."
651 die "USE flags 'raid' and 'static' conflict!" 723 die "USE flags 'raid' and 'static' conflict!"
652 fi 724 fi
653 725
654 if mysql_version_is_at_least "4.1.3" \ 726 if mysql_version_is_at_least "4.1.3" \
655 && ( use cluster || use extraengine ) \ 727 && ( use cluster || use extraengine || use embedded ) \
656 && use minimal ; then 728 && use minimal ; then
657 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
658 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 729 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
730 eerror "${M}"
731 die "${M}"
659 fi 732 fi
660 733
661 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
662 if mysql_version_is_at_least "5.0.83" ; then 734 if mysql_version_is_at_least "5.1" \
735 && xtradb_patch_available \
736 && use xtradb \
737 && use embedded ; then
738 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
739 eerror "${M}"
740 die "${M}"
741 fi
742
743 # Bug #290570, 284946, 307251
744 # Upstream changes made us need a fairly new GCC4.
745 # But only for 5.0.8[3-6]!
746 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
663 GCC_VER=$(gcc-version) 747 GCC_VER=$(gcc-version)
664 case ${GCC_VER} in 748 case ${GCC_VER} in
665 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 749 2*|3*|4.0|4.1|4.2)
750 eerror "Some releases of MySQL required a very new GCC, and then"
751 eerror "later release relaxed that requirement again. Either pick a"
752 eerror "MySQL >=5.0.87, or use a newer GCC."
753 die "Active GCC too old!" ;;
666 esac 754 esac
667 fi 755 fi
668 756
669 # This should come after all of the die statements 757 # This should come after all of the die statements
670 enewgroup mysql 60 || die "problem adding 'mysql' group" 758 enewgroup mysql 60 || die "problem adding 'mysql' group"
746 fi 834 fi
747 835
748 local rebuilddirlist d 836 local rebuilddirlist d
749 837
750 if xtradb_patch_available && use xtradb ; then 838 if xtradb_patch_available && use xtradb ; then
751 einfo "Replacing InnoDB with Percona XtraDB" 839 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
752 pushd "${S}"/storage 840 pushd "${S}"/storage >/dev/null
753 i="innobase" 841 i="innobase"
754 o="${WORKDIR}/storage-${i}.mysql-upstream" 842 o="${WORKDIR}/storage-${i}.mysql-upstream"
755 # Have we been here already? 843 # Have we been here already?
756 [ -d "${o}" ] && rm -f "${i}" 844 [ -d "${o}" ] && rm -f "${i}"
757 # Or maybe we haven't 845 # Or maybe we haven't
758 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 846 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
759 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 847 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
760 popd 848 popd >/dev/null
849 fi
850
851 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
852 einfo "Adding storage engine: PBXT"
853 pushd "${S}"/storage >/dev/null
854 i='pbxt'
855 [ -d "${i}" ] && rm -rf "${i}"
856 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
857 popd >/dev/null
761 fi 858 fi
762 859
763 if mysql_version_is_at_least "5.1.12" ; then 860 if mysql_version_is_at_least "5.1.12" ; then
764 rebuilddirlist="." 861 rebuilddirlist="."
765 # This does not seem to be needed presently. robbat2 2010/02/23 862 # This does not seem to be needed presently. robbat2 2010/02/23
859 # TODO: Move this before autoreconf !!! 956 # TODO: Move this before autoreconf !!!
860 find . -type f -name Makefile -print0 \ 957 find . -type f -name Makefile -print0 \
861 | xargs -0 -n100 sed -i \ 958 | xargs -0 -n100 sed -i \
862 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 959 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
863 960
864 if [[ $EAPI == 2 ]]; then 961 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
865 pbxt_patch_available && use pbxt && pbxt_src_configure 962 pbxt_patch_available && use pbxt && pbxt_src_configure
866 fi 963 fi
867} 964}
868 965
869# @FUNCTION: mysql_src_compile 966# @FUNCTION: mysql_src_compile
876 0 | 1) mysql_src_configure ;; 973 0 | 1) mysql_src_configure ;;
877 esac 974 esac
878 975
879 emake || die "emake failed" 976 emake || die "emake failed"
880 977
978 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
881 pbxt_patch_available && use pbxt && pbxt_src_compile 979 pbxt_patch_available && use pbxt && pbxt_src_compile
980 fi
882} 981}
883 982
884# @FUNCTION: mysql_src_install 983# @FUNCTION: mysql_src_install
885# @DESCRIPTION: 984# @DESCRIPTION:
886# Install mysql. 985# Install mysql.
892 DESTDIR="${D}" \ 991 DESTDIR="${D}" \
893 benchdir_root="${MY_SHAREDSTATEDIR}" \ 992 benchdir_root="${MY_SHAREDSTATEDIR}" \
894 testroot="${MY_SHAREDSTATEDIR}" \ 993 testroot="${MY_SHAREDSTATEDIR}" \
895 || die "emake install failed" 994 || die "emake install failed"
896 995
996 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
897 pbxt_patch_available && use pbxt && pbxt_src_install 997 pbxt_patch_available && use pbxt && pbxt_src_install
998 fi
898 999
899 # Convenience links 1000 # Convenience links
900 einfo "Making Convenience links for mysqlcheck multi-call binary" 1001 einfo "Making Convenience links for mysqlcheck multi-call binary"
901 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1002 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
902 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1003 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1198 --user=mysql \ 1299 --user=mysql \
1199 --basedir=${ROOT}/usr \ 1300 --basedir=${ROOT}/usr \
1200 --datadir=${ROOT}/${MY_DATADIR} \ 1301 --datadir=${ROOT}/${MY_DATADIR} \
1201 --max_allowed_packet=8M \ 1302 --max_allowed_packet=8M \
1202 --net_buffer_length=16K \ 1303 --net_buffer_length=16K \
1304 --default-storage-engine=MyISAM \
1203 --socket=${socket} \ 1305 --socket=${socket} \
1204 --pid-file=${pidfile}" 1306 --pid-file=${pidfile}"
1205 #einfo "About to start mysqld: ${mysqld}" 1307 #einfo "About to start mysqld: ${mysqld}"
1206 ebegin "Starting mysqld" 1308 ebegin "Starting mysqld"
1207 ${mysqld} & 1309 ${mysqld} &

Legend:
Removed from v.1.142  
changed lines
  Added in v.1.147

  ViewVC Help
Powered by ViewVC 1.1.20