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

Diff of /eclass/mysql.eclass

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

Revision 1.78 Revision 1.118
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.78 2007/05/11 08:25:11 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.118 2009/11/19 20:59:38 hanno 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 versionator
14
15case "${EAPI:-0}" in
16 2)
17 EXPORT_FUNCTIONS pkg_setup \
18 src_unpack src_prepare \
19 src_configure src_compile \
20 src_install \
21 pkg_preinst pkg_postinst \
22 pkg_config pkg_postrm
23 IUSE_DEFAULT_ON='+'
24 ;;
25 *)
26 EXPORT_FUNCTIONS pkg_setup \
27 src_unpack \
28 src_compile \
29 src_install \
30 pkg_preinst pkg_postinst \
31 pkg_config pkg_postrm
32 ;;
33esac
15 34
16# Shorten the path because the socket path length must be shorter than 107 chars 35# 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 36# and we will run a mysql server during test phase
18S="${WORKDIR}/mysql" 37S="${WORKDIR}/mysql"
19 38
20[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 39[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
21 40if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
22if [[ ${PR#r} -lt 60 ]] ; then 41 EGIT_PROJECT=mysql-extras
23 IS_BITKEEPER=0 42 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
24elif [[ ${PR#r} -lt 90 ]] ; then 43 inherit git
25 IS_BITKEEPER=60
26else
27 IS_BITKEEPER=90
28fi 44fi
29 45
30# MYSQL_VERSION_ID will be: 46# MYSQL_VERSION_ID will be:
31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 47# 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 48# This is an important part, because many of the choices the MySQL ebuild will do
33# depend on this variable. 49# depend on this variable.
34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 50# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
51# We also strip off upstream's trailing letter that they use to respin tarballs
35 52
36MYSQL_VERSION_ID="" 53MYSQL_VERSION_ID=""
54tpv="${PV%[a-z]}"
37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 55tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
38for vatom in 0 1 2 3 ; do 56for vatom in 0 1 2 3 ; do
39 # pad to length 2 57 # pad to length 2
40 tpv[${vatom}]="00${tpv[${vatom}]}" 58 tpv[${vatom}]="00${tpv[${vatom}]}"
41 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 59 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
42done 60done
43# strip leading "0" (otherwise it's considered an octal number by BASH) 61# strip leading "0" (otherwise it's considered an octal number by BASH)
44MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 62MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
45 63
64# Community features are available in mysql-community
65# AND in the re-merged mysql-5.0.82 and newer
66if [ "${PN}" == "mysql-community" ]; then
67 MYSQL_COMMUNITY_FEATURES=1
68elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
69 MYSQL_COMMUNITY_FEATURES=1
70elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
71 MYSQL_COMMUNITY_FEATURES=1
72elif [ "${PV#5.4}" != "${PV}" ]; then
73 MYSQL_COMMUNITY_FEATURES=1
74else
75 MYSQL_COMMUNITY_FEATURES=0
76fi
77
46# Be warned, *DEPEND are version-dependant 78# Be warned, *DEPEND are version-dependant
79# These are used for both runtime and compiletime
47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 80DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
48 userland_GNU? ( sys-process/procps ) 81 userland_GNU? ( sys-process/procps )
49 >=sys-apps/sed-4 82 >=sys-apps/sed-4
50 >=sys-apps/texinfo-4.7-r1 83 >=sys-apps/texinfo-4.7-r1
51 >=sys-libs/readline-4.1 84 >=sys-libs/readline-4.1
55for i in "" "-community" ; do 88for i in "" "-community" ; do
56 [[ "${i}" == ${PN#mysql} ]] || 89 [[ "${i}" == ${PN#mysql} ]] ||
57 DEPEND="${DEPEND} !dev-db/mysql${i}" 90 DEPEND="${DEPEND} !dev-db/mysql${i}"
58done 91done
59 92
93RDEPEND="${DEPEND}
94 !minimal? ( dev-db/mysql-init-scripts )
95 selinux? ( sec-policy/selinux-mysql )"
96
97# compile-time-only
60mysql_version_is_at_least "5.1" \ 98mysql_version_is_at_least "5.1" \
61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 99|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
62 100
101# compile-time-only
63mysql_version_is_at_least "5.1.12" \ 102mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 103&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
65 104
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 105# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 106PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 107
69# BitKeeper dependency, compile-time only 108# For other stuff to bring us in
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 109PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
110
111# Work out the default SERVER_URI correctly
112if [ -z "${SERVER_URI}" ]; then
113 # The community build is on the mirrors
114 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
115 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
116 # The (old) enterprise source is on the primary site only
117 elif [ "${PN}" == "mysql" ]; then
118 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
119 fi
120fi
71 121
72# Define correct SRC_URIs 122# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 123SRC_URI="${SERVER_URI}"
124
125[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
74 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 126 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
75 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 127 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
76mysql_version_is_at_least "5.1.12" \ 128mysql_version_is_at_least "5.1.12" \
77&& [[ -n "${PBXT_VERSION}" ]] \ 129&& [[ -n "${PBXT_VERSION}" ]] \
78&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 130&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
79 131
80DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 132DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
81HOMEPAGE="http://www.mysql.com/" 133HOMEPAGE="http://www.mysql.com/"
82LICENSE="GPL-2" 134LICENSE="GPL-2"
83SLOT="0" 135SLOT="0"
84IUSE="big-tables debug embedded minimal perl selinux ssl static" 136IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
85RESTRICT="confcache"
86 137
87mysql_version_is_at_least "4.1" \ 138mysql_version_is_at_least "4.1" \
88&& IUSE="${IUSE} latin1" 139&& IUSE="${IUSE} latin1"
89 140
90mysql_version_is_at_least "4.1.3" \ 141mysql_version_is_at_least "4.1.3" \
95 146
96mysql_version_is_at_least "5.0.18" \ 147mysql_version_is_at_least "5.0.18" \
97&& IUSE="${IUSE} max-idx-128" 148&& IUSE="${IUSE} max-idx-128"
98 149
99mysql_version_is_at_least "5.1" \ 150mysql_version_is_at_least "5.1" \
100&& IUSE="${IUSE} innodb"
101
102mysql_version_is_at_least "5.1" \
103|| IUSE="${IUSE} berkdb" 151|| IUSE="${IUSE} berkdb"
104 152
105mysql_version_is_at_least "5.1.12" \ 153mysql_version_is_at_least "5.1.12" \
106&& IUSE="${IUSE} pbxt" 154&& IUSE="${IUSE} pbxt"
107 155
108RDEPEND="${DEPEND} 156[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
109 !minimal? ( dev-db/mysql-init-scripts ) 157&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
110 selinux? ( sec-policy/selinux-mysql )"
111
112EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
113 pkg_postinst pkg_config pkg_postrm
114 158
115# 159#
116# HELPER FUNCTIONS: 160# HELPER FUNCTIONS:
117# 161#
118
119bitkeeper_fetch() {
120 local reposuf
121 if [[ -z "${1}" ]] ; then
122 local tpv
123 tpv=( ${PV//[-._]/ } )
124 reposuf="mysql-${tpv[0]}.${tpv[1]}"
125 else
126 reposuf="${1}"
127 fi
128 einfo "Using '${reposuf}' repository."
129 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
130 ## -- ebk_store_dir: bitkeeper sources store directory
131 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
132 ## -- ebk_fetch_cmd: bitkeeper fetch command
133 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
134 # hint: does not work
135 local ebk_fetch_cmd="sfioball"
136 ## -- ebk_update_cmd: bitkeeper update command
137 local ebk_update_cmd="update"
138
139 # addread "/etc/bitkeeper"
140 addwrite "${ebk_store_dir}"
141
142 if [[ ! -d "${ebk_store_dir}" ]] ; then
143 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
144 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
145 fi
146
147 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
148
149 local wc_path=${reposuf}
150
151 if [[ ! -d "${wc_path}" ]] ; then
152 local options="-r+"
153
154 # first checkout
155 einfo "bitkeeper checkout start -->"
156 einfo " repository: ${repo_uri}"
157
158 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
159 || die "BK: couldn't fetch from ${repo_uri}"
160 else
161 if [[ ! -d "${wc_path}/BK" ]] ; then
162 popd
163 die "Looks like ${wc_path} is not a bitkeeper path"
164 fi
165
166 # update working copy
167 einfo "bitkeeper update start -->"
168 einfo " repository: ${repo_uri}"
169
170 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
171 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
172 fi
173
174 einfo " working copy: ${wc_path}"
175 cd "${wc_path}"
176 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
177
178 echo
179 popd
180}
181 162
182mysql_disable_test() { 163mysql_disable_test() {
183 local testname="${1}" ; shift 164 local testname="${1}" ; shift
184 local reason="${@}" 165 local reason="${@}"
185 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 166 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
206 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 187 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
207 | sed -ne '/datadir/s|^--datadir=||p' \ 188 | sed -ne '/datadir/s|^--datadir=||p' \
208 | tail -n1` 189 | tail -n1`
209 if [[ -z "${MY_DATADIR}" ]] ; then 190 if [[ -z "${MY_DATADIR}" ]] ; then
210 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 191 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
211 | sed -e 's/.*=\s*//'` 192 | sed -e 's/.*=\s*//' \
193 | tail -n1`
212 fi 194 fi
213 fi 195 fi
214 if [[ -z "${MY_DATADIR}" ]] ; then 196 if [[ -z "${MY_DATADIR}" ]] ; then
215 MY_DATADIR="${MY_LOCALSTATEDIR}" 197 MY_DATADIR="${MY_LOCALSTATEDIR}"
216 einfo "Using default MY_DATADIR" 198 einfo "Using default MY_DATADIR"
217 fi 199 fi
218 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 200 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
219 201
220 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 202 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
221 if [[ -e "${MY_DATADIR}" ]] ; then 203 if [[ -e "${MY_DATADIR}" ]] ; then
222 elog "Previous datadir found, it's YOUR job to change" 204 # If you get this and you're wondering about it, see bug #207636
223 elog "ownership and take care of it" 205 elog "MySQL datadir found in ${MY_DATADIR}"
206 elog "A new one will not be created."
224 PREVIOUS_DATADIR="yes" 207 PREVIOUS_DATADIR="yes"
225 else 208 else
226 PREVIOUS_DATADIR="no" 209 PREVIOUS_DATADIR="no"
227 fi 210 fi
228 export PREVIOUS_DATADIR 211 export PREVIOUS_DATADIR
229 fi 212 fi
213 else
214 if [[ ${EBUILD_PHASE} == "config" ]]; then
215 local new_MY_DATADIR
216 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
217 | sed -ne '/datadir/s|^--datadir=||p' \
218 | tail -n1`
219
220 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
221 ewarn "MySQL MY_DATADIR has changed"
222 ewarn "from ${MY_DATADIR}"
223 ewarn "to ${new_MY_DATADIR}"
224 MY_DATADIR="${new_MY_DATADIR}"
225 fi
226 fi
230 fi 227 fi
231 228
232 MY_SOURCEDIR=${SERVER_URI##*/} 229 MY_SOURCEDIR=${SERVER_URI##*/}
233 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 230 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
234 231
239 236
240configure_minimal() { 237configure_minimal() {
241 # These are things we exclude from a minimal build, please 238 # These are things we exclude from a minimal build, please
242 # note that the server actually does get built and installed, 239 # note that the server actually does get built and installed,
243 # but we then delete it before packaging. 240 # but we then delete it before packaging.
244 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 241 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
245 242
246 for i in ${minimal_exclude_list} ; do 243 for i in ${minimal_exclude_list} ; do
247 myconf="${myconf} --without-${i}" 244 myconf="${myconf} --without-${i}"
248 done 245 done
249 myconf="${myconf} --with-extra-charsets=none" 246 myconf="${myconf} --with-extra-charsets=none"
250 myconf="${myconf} --enable-local-infile" 247 myconf="${myconf} --enable-local-infile"
251 248
252 if use static ; then 249 if use static ; then
253 myconf="${myconf} --with-client-ldflags=-all-static" 250 myconf="${myconf} --with-client-ldflags=-all-static"
254 myconf="${myconf} --disable-shared" 251 myconf="${myconf} --disable-shared --with-pic"
255 else 252 else
256 myconf="${myconf} --enable-shared --enable-static" 253 myconf="${myconf} --enable-shared --enable-static"
257 fi 254 fi
258 255
259 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 256 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
275 myconf="${myconf} --without-libwrap" 272 myconf="${myconf} --without-libwrap"
276 273
277 if use static ; then 274 if use static ; then
278 myconf="${myconf} --with-mysqld-ldflags=-all-static" 275 myconf="${myconf} --with-mysqld-ldflags=-all-static"
279 myconf="${myconf} --with-client-ldflags=-all-static" 276 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 277 myconf="${myconf} --disable-shared --with-pic"
281 else 278 else
282 myconf="${myconf} --enable-shared --enable-static" 279 myconf="${myconf} --enable-shared --enable-static"
283 fi 280 fi
284 281
285 if use debug ; then 282 if use debug ; then
289 mysql_version_is_at_least "4.1.3" \ 286 mysql_version_is_at_least "4.1.3" \
290 && use cluster \ 287 && use cluster \
291 && myconf="${myconf} --without-ndb-debug" 288 && myconf="${myconf} --without-ndb-debug"
292 fi 289 fi
293 290
291 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
292 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
293 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
294 ewarn "You MUST file bugs without these variables set."
295 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
296 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
294 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 297 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
295 myconf="${myconf} --with-charset=utf8" 298 myconf="${myconf} --with-charset=utf8"
296 myconf="${myconf} --with-collation=utf8_general_ci" 299 myconf="${myconf} --with-collation=utf8_general_ci"
297 else 300 else
298 myconf="${myconf} --with-charset=latin1" 301 myconf="${myconf} --with-charset=latin1"
299 myconf="${myconf} --with-collation=latin1_swedish_ci" 302 myconf="${myconf} --with-collation=latin1_swedish_ci"
300 fi 303 fi
301 304
302 if use embedded ; then 305 if use embedded ; then
303 myconf="${myconf} --with-embedded-privilege-control" 306 myconf="${myconf} --with-embedded-privilege-control"
304 myconf="${myconf} --with-embedded-server" 307 myconf="${myconf} --with-embedded-server"
327 myconf="${myconf} $(use_with ssl)" 330 myconf="${myconf} $(use_with ssl)"
328 else 331 else
329 myconf="${myconf} $(use_with ssl openssl)" 332 myconf="${myconf} $(use_with ssl openssl)"
330 fi 333 fi
331 334
335 if mysql_version_is_at_least "5.0.60" ; then
332 if use berkdb ; then 336 if use berkdb ; then
337 elog "Berkeley DB support was disabled due to build failures"
338 elog "on multiple arches, go to a version earlier than 5.0.60"
339 elog "if you want it again. Gentoo bug #224067."
340 fi
341 myconf="${myconf} --without-berkeley-db"
342 elif use berkdb ; then
333 # The following fix is due to a bug with bdb on SPARC's. See: 343 # 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 344 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
335 # It comes down to non-64-bit safety problems. 345 # It comes down to non-64-bit safety problems.
336 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 346 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" 347 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
363 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 373 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
364 if mysql_version_is_at_least "5.0.3" ; then 374 if mysql_version_is_at_least "5.0.3" ; then
365 elog "Before using the Federated storage engine, please be sure to read" 375 elog "Before using the Federated storage engine, please be sure to read"
366 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 376 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
367 myconf="${myconf} --with-federated-storage-engine" 377 myconf="${myconf} --with-federated-storage-engine"
378 fi
379 fi
380
381 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
382 myconf="${myconf} `use_enable community community-features`"
383 if use community; then
384 myconf="${myconf} `use_enable profiling`"
385 else
386 myconf="${myconf} --disable-profiling"
368 fi 387 fi
369 fi 388 fi
370 389
371 mysql_version_is_at_least "5.0.18" \ 390 mysql_version_is_at_least "5.0.18" \
372 && use max-idx-128 \ 391 && use max-idx-128 \
395 414
396 elog "Before using the Federated storage engine, please be sure to read" 415 elog "Before using the Federated storage engine, please be sure to read"
397 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 416 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
398 fi 417 fi
399 418
400 if use innodb ; then 419 # Upstream specifically requests that InnoDB always be built.
401 plugins="${plugins},innobase" 420 plugins="${plugins},innobase"
402 fi
403 421
404 # like configuration=max-no-ndb 422 # like configuration=max-no-ndb
405 if use cluster ; then 423 if use cluster ; then
406 plugins="${plugins},ndbcluster" 424 plugins="${plugins},ndbcluster"
407 myconf="${myconf} --with-ndb-binlog" 425 myconf="${myconf} --with-ndb-binlog"
412 fi 430 fi
413 431
414 myconf="${myconf} --with-plugins=${plugins}" 432 myconf="${myconf} --with-plugins=${plugins}"
415} 433}
416 434
417pbxt_src_compile() { 435pbxt_src_configure() {
418 mysql_init_vars 436 mysql_init_vars
419 437
420 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 438 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
421 439
422 einfo "Reconfiguring dir '${PWD}'" 440 einfo "Reconfiguring dir '${PWD}'"
425 local myconf="" 443 local myconf=""
426 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 444 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
427 use debug && myconf="${myconf} --with-debug=full" 445 use debug && myconf="${myconf} --with-debug=full"
428 # TODO: is it safe/needed to use econf here ? 446 # TODO: is it safe/needed to use econf here ?
429 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 447 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
448}
449
450pbxt_src_compile() {
451 # Be backwards compatible for now
452 if [[ $EAPI != 2 ]]; then
453 pbxt_src_configure
454 fi
430 # TODO: is it safe/needed to use emake here ? 455 # TODO: is it safe/needed to use emake here ?
431 make || die "Problem making PBXT storage engine (${myconf})" 456 make || die "Problem making PBXT storage engine (${myconf})"
432 457
433 popd 458 popd
434 # TODO: modify test suite for PBXT 459 # TODO: modify test suite for PBXT
441} 466}
442 467
443# 468#
444# EBUILD FUNCTIONS 469# EBUILD FUNCTIONS
445# 470#
446
447mysql_pkg_setup() { 471mysql_pkg_setup() {
448 enewgroup mysql 60 || die "problem adding 'mysql' group" 472 if hasq test ${FEATURES} ; then
449 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 473 if ! use minimal ; then
474 if [[ $UID -eq 0 ]]; then
475 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
476 fi
477 fi
478 fi
450 479
451 # Check for USE flag problems in pkg_setup 480 # Check for USE flag problems in pkg_setup
452 if use static && use ssl ; then 481 if use static && use ssl ; then
453 eerror "MySQL does not support being built statically with SSL support enabled!" 482 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!" 483 die "MySQL does not support being built statically with SSL support enabled!"
467 && use minimal ; then 496 && use minimal ; then
468 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 497 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 498 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
470 fi 499 fi
471 500
501 # This should come after all of the die statements
502 enewgroup mysql 60 || die "problem adding 'mysql' group"
503 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
504
472 mysql_check_version_range "4.0 to 5.0.99.99" \ 505 mysql_check_version_range "4.0 to 5.0.99.99" \
473 && use berkdb \ 506 && use berkdb \
474 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 507 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
475} 508}
476 509
477mysql_src_unpack() { 510mysql_src_unpack() {
478 # Initialize the proper variables first 511 # Initialize the proper variables first
479 mysql_init_vars 512 mysql_init_vars
480 513
481 unpack ${A} 514 unpack ${A}
482 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 515 # Grab the patches
483 if mysql_check_version_range "5.1 to 5.1.99" ; then 516 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
484 bitkeeper_fetch "mysql-5.1-ndb" 517
485 elif mysql_check_version_range "5.2 to 5.2.99" ; then
486 bitkeeper_fetch "mysql-5.2-falcon"
487 else
488 bitkeeper_fetch
489 fi
490 cd "${S}"
491 einfo "Running upstream autorun over BK sources ..."
492 BUILD/autorun.sh
493 else
494 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 518 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
519
520 # Be backwards compatible for now
521 if [[ $EAPI != 2 ]]; then
522 mysql_src_prepare
523 fi
524}
525
526mysql_src_prepare() {
495 cd "${S}" 527 cd "${S}"
496 fi
497 528
498 # Apply the patches for this MySQL version 529 # Apply the patches for this MySQL version
499 EPATCH_SUFFIX="patch" 530 EPATCH_SUFFIX="patch"
500 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 531 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
532 # Clean out old items
533 rm -f "${EPATCH_SOURCE}"/*
534 # Now link in right patches
501 mysql_mv_patches 535 mysql_mv_patches
536 # And apply
502 epatch 537 epatch
503 538
504 # Additional checks, remove bundled zlib 539 # Additional checks, remove bundled zlib
505 rm -f "${S}/zlib/"*.[ch] 540 rm -f "${S}/zlib/"*.[ch]
506 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 541 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
523 local rebuilddirlist d 558 local rebuilddirlist d
524 559
525 if mysql_version_is_at_least "5.1.12" ; then 560 if mysql_version_is_at_least "5.1.12" ; then
526 rebuilddirlist="." 561 rebuilddirlist="."
527 # TODO: check this with a cmake expert 562 # TODO: check this with a cmake expert
528 use innodb \
529 && cmake \ 563 cmake \
530 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 564 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
531 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 565 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
532 "storage/innobase" 566 "storage/innobase"
533 else 567 else
534 rebuilddirlist=". innobase" 568 rebuilddirlist=". innobase"
535 fi 569 fi
536 570
544 if mysql_check_version_range "4.1 to 5.0.99.99" \ 578 if mysql_check_version_range "4.1 to 5.0.99.99" \
545 && use berkdb ; then 579 && use berkdb ; then
546 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 580 [[ -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" \ 581 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
548 || die "Could not copy libtool.m4 to bdb/dist/" 582 || die "Could not copy libtool.m4 to bdb/dist/"
583 #These files exist only with libtool-2*, and need to be included.
584 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
585 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
586 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
587 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
588 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
589 fi
549 pushd "bdb/dist" &>/dev/null 590 pushd "bdb/dist" &>/dev/null
550 sh s_all \ 591 sh s_all \
551 || die "Failed bdb reconfigure" 592 || die "Failed bdb reconfigure"
552 popd &>/dev/null 593 popd &>/dev/null
553 fi 594 fi
554} 595}
555 596
556mysql_src_compile() { 597mysql_src_configure() {
557 # Make sure the vars are correctly initialized 598 # Make sure the vars are correctly initialized
558 mysql_init_vars 599 mysql_init_vars
559 600
560 # $myconf is modified by the configure_* functions 601 # $myconf is modified by the configure_* functions
561 local myconf="" 602 local myconf=""
575 filter-flags "-O" "-O[01]" 616 filter-flags "-O" "-O[01]"
576 617
577 # glib-2.3.2_pre fix, bug #16496 618 # glib-2.3.2_pre fix, bug #16496
578 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 619 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
579 620
621 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
622 # fail badly during cluster startup.
623 if [[ $(gcc-major-version) -lt 4 ]]; then
624 filter-flags "-fstack-protector-all"
625 fi
626
580 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 627 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
581 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 628 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
582 mysql_version_is_at_least "5.0" \ 629 mysql_version_is_at_least "5.0" \
583 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 630 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
584 export CXXFLAGS 631 export CXXFLAGS
632
633 # bug #283926, with GCC4.4, this is required to get correct behavior.
634 append-flags -fno-strict-aliasing
585 635
586 econf \ 636 econf \
587 --libexecdir="/usr/sbin" \ 637 --libexecdir="/usr/sbin" \
588 --sysconfdir="${MY_SYSCONFDIR}" \ 638 --sysconfdir="${MY_SYSCONFDIR}" \
589 --localstatedir="${MY_LOCALSTATEDIR}" \ 639 --localstatedir="${MY_LOCALSTATEDIR}" \
600 # TODO: Move this before autoreconf !!! 650 # TODO: Move this before autoreconf !!!
601 find . -type f -name Makefile -print0 \ 651 find . -type f -name Makefile -print0 \
602 | xargs -0 -n100 sed -i \ 652 | xargs -0 -n100 sed -i \
603 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 653 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
604 654
655 if [[ $EAPI == 2 ]]; then
656 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
657 fi
658}
659
660mysql_src_compile() {
661 # Be backwards compatible for now
662 if [[ $EAPI != 2 ]]; then
663 mysql_src_configure
664 fi
665
605 emake || die "emake failed" 666 emake || die "emake failed"
606 667
607 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 668 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
608} 669}
609 670
613 674
614 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 675 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
615 676
616 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 677 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
617 678
618 insinto "${MY_INCLUDEDIR}"
619 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
620
621 # Convenience links 679 # Convenience links
680 einfo "Making Convenience links for mysqlcheck multi-call binary"
622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 681 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 682 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
624 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 683 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
625 684
626 # Various junk (my-*.cnf moved elsewhere) 685 # Various junk (my-*.cnf moved elsewhere)
686 einfo "Removing duplicate /usr/share/mysql files"
627 rm -Rf "${D}/usr/share/info" 687 rm -Rf "${D}/usr/share/info"
628 for removeme in "mysql-log-rotate" mysql.server* \ 688 for removeme in "mysql-log-rotate" mysql.server* \
629 binary-configure* my-*.cnf mi_test_all* 689 binary-configure* my-*.cnf mi_test_all*
630 do 690 do
631 rm -f "${D}"/usr/share/mysql/${removeme} 691 rm -f "${D}"/usr/share/mysql/${removeme}
632 done 692 done
633 693
634 # Clean up stuff for a minimal build 694 # Clean up stuff for a minimal build
635 if use minimal ; then 695 if use minimal ; then
696 einfo "Remove all extra content for minimal build"
636 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 697 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
637 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} 698 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}
638 rm -f "${D}/usr/sbin/mysqld" 699 rm -f "${D}/usr/sbin/mysqld"
639 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 700 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
640 fi 701 fi
643 if mysql_version_is_at_least "4.1" ; then 704 if mysql_version_is_at_least "4.1" ; then
644 mysql_mycnf_version="4.1" 705 mysql_mycnf_version="4.1"
645 else 706 else
646 mysql_mycnf_version="4.0" 707 mysql_mycnf_version="4.0"
647 fi 708 fi
709 einfo "Building default my.cnf"
648 insinto "${MY_SYSCONFDIR}" 710 insinto "${MY_SYSCONFDIR}"
649 doins scripts/mysqlaccess.conf 711 doins scripts/mysqlaccess.conf
650 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 712 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
651 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 713 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
652 > "${TMPDIR}/my.cnf.ok" 714 > "${TMPDIR}/my.cnf.ok"
655 fi 717 fi
656 newins "${TMPDIR}/my.cnf.ok" my.cnf 718 newins "${TMPDIR}/my.cnf.ok" my.cnf
657 719
658 # Minimal builds don't have the MySQL server 720 # Minimal builds don't have the MySQL server
659 if ! use minimal ; then 721 if ! use minimal ; then
722 einfo "Creating initial directories"
660 # Empty directories ... 723 # Empty directories ...
661 diropts "-m0750" 724 diropts "-m0750"
662 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 725 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
663 dodir "${MY_DATADIR}" 726 dodir "${MY_DATADIR}"
664 keepdir "${MY_DATADIR}" 727 keepdir "${MY_DATADIR}"
672 chown -R mysql:mysql "${D}/${folder}" 735 chown -R mysql:mysql "${D}/${folder}"
673 done 736 done
674 fi 737 fi
675 738
676 # Docs 739 # Docs
740 einfo "Installing docs"
677 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 741 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
678 doinfo ${S}/Docs/mysql.info 742 doinfo "${S}"/Docs/mysql.info
679 743
680 # Minimal builds don't have the MySQL server 744 # Minimal builds don't have the MySQL server
681 if ! use minimal ; then 745 if ! use minimal ; then
746 einfo "Including support files and sample configurations"
682 docinto "support-files" 747 docinto "support-files"
683 for script in \ 748 for script in \
684 support-files/my-*.cnf \ 749 "${S}"/support-files/my-*.cnf \
685 support-files/magic \ 750 "${S}"/support-files/magic \
686 support-files/ndb-config-2-node.ini 751 "${S}"/support-files/ndb-config-2-node.ini
687 do 752 do
688 dodoc "${script}" 753 dodoc "${script}"
689 done 754 done
690 755
691 docinto "scripts" 756 docinto "scripts"
692 for script in scripts/mysql* ; do 757 for script in "${S}"/scripts/mysql* ; do
693 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 758 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
694 done 759 done
695 760
696 fi 761 fi
697 762
757 && use berkdb \ 822 && use berkdb \
758 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 823 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
759} 824}
760 825
761mysql_pkg_config() { 826mysql_pkg_config() {
827 local old_MY_DATADIR="${MY_DATADIR}"
828
762 # Make sure the vars are correctly initialized 829 # Make sure the vars are correctly initialized
763 mysql_init_vars 830 mysql_init_vars
764 831
765 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 832 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
766 833
767 if built_with_use ${CATEGORY}/${PN} minimal ; then 834 if built_with_use ${CATEGORY}/${PN} minimal ; then
768 die "Minimal builds do NOT include the MySQL server" 835 die "Minimal builds do NOT include the MySQL server"
836 fi
837
838 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
839 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
840 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
841
842 if [[ -d "${old_MY_DATADIR_s}" ]]; then
843 if [[ -d "${MY_DATADIR_s}" ]]; then
844 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
845 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
846 else
847 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
848 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
849 || die "Moving MY_DATADIR failed"
850 fi
851 else
852 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
853 if [[ -d "${MY_DATADIR_s}" ]]; then
854 ewarn "Attempting to use ${MY_DATADIR_s}"
855 else
856 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
857 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
858 fi
859 fi
769 fi 860 fi
770 861
771 local pwd1="a" 862 local pwd1="a"
772 local pwd2="b" 863 local pwd2="b"
773 local maxtry=5 864 local maxtry=5
777 ewarn "(${ROOT}/${MY_DATADIR}/*)" 868 ewarn "(${ROOT}/${MY_DATADIR}/*)"
778 ewarn "Please rename or delete it if you wish to replace it." 869 ewarn "Please rename or delete it if you wish to replace it."
779 die "MySQL database already exists!" 870 die "MySQL database already exists!"
780 fi 871 fi
781 872
873 # Bug #213475 - MySQL _will_ object strenously if your machine is named
874 # localhost. Also causes weird failures.
875 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
876
782 einfo "Creating the mysql database and setting proper" 877 einfo "Creating the mysql database and setting proper"
783 einfo "permissions on it ..." 878 einfo "permissions on it ..."
784 879
785 einfo "Insert a password for the mysql 'root' user" 880 einfo "Insert a password for the mysql 'root' user"
786 ewarn "Avoid [\"'\\_%] characters in the password" 881 ewarn "Avoid [\"'\\_%] characters in the password"
801 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 896 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
802 || touch "${TMPDIR}/fill_help_tables.sql" 897 || touch "${TMPDIR}/fill_help_tables.sql"
803 help_tables="${TMPDIR}/fill_help_tables.sql" 898 help_tables="${TMPDIR}/fill_help_tables.sql"
804 899
805 pushd "${TMPDIR}" &>/dev/null 900 pushd "${TMPDIR}" &>/dev/null
806 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 901 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
902 if [ $? -ne 0 ]; then
903 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
904 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
905 fi
807 popd &>/dev/null 906 popd &>/dev/null
808 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 907 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
809 || die "MySQL databases not installed" 908 || die "MySQL databases not installed"
810 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null 909 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
811 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null 910 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
812 911
813 if mysql_version_is_at_least "4.1.3" ; then 912 if mysql_version_is_at_least "4.1.3" ; then
814 options="--skip-ndbcluster" 913 options="--skip-ndbcluster"
815 914
816 # Filling timezones, see 915 # Filling timezones, see

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20