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

Diff of /eclass/mysql.eclass

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

Revision 1.73 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/mysql.eclass,v 1.73 2007/04/15 13:00:51 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/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: 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
15 14
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="20090228-0714Z"
21 20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
22if [[ ${PR#r} -lt 60 ]] ; then 21 EGIT_PROJECT=mysql-extras
23 IS_BITKEEPER=0 22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
24elif [[ ${PR#r} -lt 90 ]] ; then 23 inherit git
25 IS_BITKEEPER=60
26else
27 IS_BITKEEPER=90
28fi 24fi
29 25
30# MYSQL_VERSION_ID will be: 26# MYSQL_VERSION_ID will be:
31# 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]
32# 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
33# depend on this variable. 29# depend on this variable.
34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 30# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
31# We also strip off upstream's trailing letter that they use to respin tarballs
35 32
36MYSQL_VERSION_ID="" 33MYSQL_VERSION_ID=""
34tpv="${PV%[a-z]}"
37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 35tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
38for vatom in 0 1 2 3 ; do 36for vatom in 0 1 2 3 ; do
39 # pad to length 2 37 # pad to length 2
40 tpv[${vatom}]="00${tpv[${vatom}]}" 38 tpv[${vatom}]="00${tpv[${vatom}]}"
41 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 39 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
42done 40done
43# 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)
44MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 42MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
45 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
46# Be warned, *DEPEND are version-dependant 54# Be warned, *DEPEND are version-dependant
55# These are used for both runtime and compiletime
47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 56DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
48 userland_GNU? ( sys-process/procps ) 57 userland_GNU? ( sys-process/procps )
49 >=sys-apps/sed-4 58 >=sys-apps/sed-4
50 >=sys-apps/texinfo-4.7-r1 59 >=sys-apps/texinfo-4.7-r1
51 >=sys-libs/readline-4.1 60 >=sys-libs/readline-4.1
55for i in "" "-community" ; do 64for i in "" "-community" ; do
56 [[ "${i}" == ${PN#mysql} ]] || 65 [[ "${i}" == ${PN#mysql} ]] ||
57 DEPEND="${DEPEND} !dev-db/mysql${i}" 66 DEPEND="${DEPEND} !dev-db/mysql${i}"
58done 67done
59 68
69RDEPEND="${DEPEND}
70 !minimal? ( dev-db/mysql-init-scripts )
71 selinux? ( sec-policy/selinux-mysql )"
72
73# compile-time-only
60mysql_version_is_at_least "5.1" \ 74mysql_version_is_at_least "5.1" \
61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 75|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
62 76
77# compile-time-only
63mysql_version_is_at_least "5.1.12" \ 78mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 79&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
65 80
66# 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
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 82PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 83
69# BitKeeper dependency, compile-time only 84# For other stuff to bring us in
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 85PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
86
87# Work out the default SERVER_URI correctly
88if [ -z "${SERVER_URI}" ]; then
89 # The community build is on the mirrors
90 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
91 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
92 # The (old) enterprise source is on the primary site only
93 elif [ "${PN}" == "mysql" ]; then
94 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
95 fi
96fi
71 97
72# Define correct SRC_URIs 98# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 99SRC_URI="${SERVER_URI}"
100
101[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
74 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 102 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
75 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 103 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
76mysql_version_is_at_least "5.1.12" \ 104mysql_version_is_at_least "5.1.12" \
77&& [[ -n "${PBXT_VERSION}" ]] \ 105&& [[ -n "${PBXT_VERSION}" ]] \
78&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 106&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
80DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 108DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
81HOMEPAGE="http://www.mysql.com/" 109HOMEPAGE="http://www.mysql.com/"
82LICENSE="GPL-2" 110LICENSE="GPL-2"
83SLOT="0" 111SLOT="0"
84IUSE="big-tables debug embedded minimal perl selinux ssl static" 112IUSE="big-tables debug embedded minimal perl selinux ssl static"
85RESTRICT="confcache"
86 113
87mysql_version_is_at_least "4.1" \ 114mysql_version_is_at_least "4.1" \
88&& IUSE="${IUSE} latin1" 115&& IUSE="${IUSE} latin1"
89 116
90mysql_version_is_at_least "4.1.3" \ 117mysql_version_is_at_least "4.1.3" \
95 122
96mysql_version_is_at_least "5.0.18" \ 123mysql_version_is_at_least "5.0.18" \
97&& IUSE="${IUSE} max-idx-128" 124&& IUSE="${IUSE} max-idx-128"
98 125
99mysql_version_is_at_least "5.1" \ 126mysql_version_is_at_least "5.1" \
100&& IUSE="${IUSE} innodb"
101
102mysql_version_is_at_least "5.1" \
103|| IUSE="${IUSE} berkdb" 127|| IUSE="${IUSE} berkdb"
104 128
105mysql_version_is_at_least "5.1.12" \ 129mysql_version_is_at_least "5.1.12" \
106&& IUSE="${IUSE} pbxt" 130&& IUSE="${IUSE} pbxt"
107 131
108RDEPEND="${DEPEND} 132[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
109 !minimal? ( dev-db/mysql-init-scripts ) 133&& IUSE="${IUSE} community profiling"
110 selinux? ( sec-policy/selinux-mysql )"
111 134
112EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 135EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
113 pkg_postinst pkg_config pkg_postrm 136 pkg_postinst pkg_config pkg_postrm
114 137
115# 138#
116# HELPER FUNCTIONS: 139# HELPER FUNCTIONS:
117# 140#
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 141
182mysql_disable_test() { 142mysql_disable_test() {
183 local testname="${1}" ; shift 143 local testname="${1}" ; shift
184 local reason="${@}" 144 local reason="${@}"
185 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 145 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
198 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 158 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
199 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 159 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
200 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 160 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
201 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 161 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
202 162
203 if [[ -z "${DATADIR}" ]] ; then 163 if [[ -z "${MY_DATADIR}" ]] ; then
204 DATADIR="" 164 MY_DATADIR=""
205 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 165 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
206 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 166 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
207 | sed -ne '/datadir/s|^--datadir=||p' \ 167 | sed -ne '/datadir/s|^--datadir=||p' \
208 | tail -n1` 168 | tail -n1`
209 if [[ -z "${DATADIR}" ]] ; then 169 if [[ -z "${MY_DATADIR}" ]] ; then
210 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 170 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
211 | sed -e 's/.*=\s*//'` 171 | sed -e 's/.*=\s*//' \
172 | tail -n1`
212 fi 173 fi
213 fi 174 fi
214 if [[ -z "${DATADIR}" ]] ; then 175 if [[ -z "${MY_DATADIR}" ]] ; then
215 DATADIR="${MY_LOCALSTATEDIR}" 176 MY_DATADIR="${MY_LOCALSTATEDIR}"
216 einfo "Using default DATADIR" 177 einfo "Using default MY_DATADIR"
217 fi 178 fi
218 elog "MySQL DATADIR is ${DATADIR}" 179 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
219 180
220 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 181 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
221 if [[ -e "${DATADIR}" ]] ; then 182 if [[ -e "${MY_DATADIR}" ]] ; then
222 elog "Previous datadir found, it's YOUR job to change" 183 # If you get this and you're wondering about it, see bug #207636
223 elog "ownership and take care of it" 184 elog "MySQL datadir found in ${MY_DATADIR}"
185 elog "A new one will not be created."
224 PREVIOUS_DATADIR="yes" 186 PREVIOUS_DATADIR="yes"
225 else 187 else
226 PREVIOUS_DATADIR="no" 188 PREVIOUS_DATADIR="no"
227 fi 189 fi
228 export PREVIOUS_DATADIR 190 export PREVIOUS_DATADIR
229 fi 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
205 fi
230 fi 206 fi
231 207
232 MY_SOURCEDIR=${SERVER_URI##*/} 208 MY_SOURCEDIR=${SERVER_URI##*/}
233 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 209 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
234 210
235 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 211 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
236 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 212 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
237 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 213 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
238} 214}
239 215
240configure_minimal() { 216configure_minimal() {
241 # These are things we exclude from a minimal build, please 217 # These are things we exclude from a minimal build, please
242 # note that the server actually does get built and installed, 218 # note that the server actually does get built and installed,
243 # but we then delete it before packaging. 219 # but we then delete it before packaging.
244 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 220 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
245 221
246 for i in ${minimal_exclude_list} ; do 222 for i in ${minimal_exclude_list} ; do
247 myconf="${myconf} --without-${i}" 223 myconf="${myconf} --without-${i}"
248 done 224 done
249 myconf="${myconf} --with-extra-charsets=none" 225 myconf="${myconf} --with-extra-charsets=none"
250 myconf="${myconf} --enable-local-infile" 226 myconf="${myconf} --enable-local-infile"
251 227
252 if use static ; then 228 if use static ; then
253 myconf="${myconf} --with-client-ldflags=-all-static" 229 myconf="${myconf} --with-client-ldflags=-all-static"
254 myconf="${myconf} --disable-shared" 230 myconf="${myconf} --disable-shared --with-pic"
255 else 231 else
256 myconf="${myconf} --enable-shared --enable-static" 232 myconf="${myconf} --enable-shared --enable-static"
257 fi 233 fi
258 234
259 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 235 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
275 myconf="${myconf} --without-libwrap" 251 myconf="${myconf} --without-libwrap"
276 252
277 if use static ; then 253 if use static ; then
278 myconf="${myconf} --with-mysqld-ldflags=-all-static" 254 myconf="${myconf} --with-mysqld-ldflags=-all-static"
279 myconf="${myconf} --with-client-ldflags=-all-static" 255 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 256 myconf="${myconf} --disable-shared --with-pic"
281 else 257 else
282 myconf="${myconf} --enable-shared --enable-static" 258 myconf="${myconf} --enable-shared --enable-static"
283 fi 259 fi
284 260
285 if use debug ; then 261 if use debug ; then
289 mysql_version_is_at_least "4.1.3" \ 265 mysql_version_is_at_least "4.1.3" \
290 && use cluster \ 266 && use cluster \
291 && myconf="${myconf} --without-ndb-debug" 267 && myconf="${myconf} --without-ndb-debug"
292 fi 268 fi
293 269
270 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
271 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
272 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
273 ewarn "You MUST file bugs without these variables set."
274 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
275 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
294 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 276 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
295 myconf="${myconf} --with-charset=utf8" 277 myconf="${myconf} --with-charset=utf8"
296 myconf="${myconf} --with-collation=utf8_general_ci" 278 myconf="${myconf} --with-collation=utf8_general_ci"
297 else 279 else
298 myconf="${myconf} --with-charset=latin1" 280 myconf="${myconf} --with-charset=latin1"
299 myconf="${myconf} --with-collation=latin1_swedish_ci" 281 myconf="${myconf} --with-collation=latin1_swedish_ci"
300 fi 282 fi
301 283
302 if use embedded ; then 284 if use embedded ; then
303 myconf="${myconf} --with-embedded-privilege-control" 285 myconf="${myconf} --with-embedded-privilege-control"
304 myconf="${myconf} --with-embedded-server" 286 myconf="${myconf} --with-embedded-server"
327 myconf="${myconf} $(use_with ssl)" 309 myconf="${myconf} $(use_with ssl)"
328 else 310 else
329 myconf="${myconf} $(use_with ssl openssl)" 311 myconf="${myconf} $(use_with ssl openssl)"
330 fi 312 fi
331 313
314 if mysql_version_is_at_least "5.0.60" ; then
315 if use berkdb ; then
316 elog "Berkeley DB support was disabled due to build failures"
317 elog "on multiple arches, go to a version earlier than 5.0.60"
318 elog "if you want it again. Gentoo bug #224067."
319 fi
320 myconf="${myconf} --without-berkeley-db"
321 elif use berkdb ; then
332 # The following fix is due to a bug with bdb on SPARC's. See: 322 # The following fix is due to a bug with bdb on SPARC's. See:
333 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 323 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
334 # It comes down to non-64-bit safety problems. 324 # It comes down to non-64-bit safety problems.
335 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 325 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
336 elog "Berkeley DB support was disabled due to incompatible arch" 326 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
327 myconf="${myconf} --without-berkeley-db"
328 else
329 myconf="${myconf} --with-berkeley-db=./bdb"
330 fi
331 else
337 myconf="${myconf} --without-berkeley-db" 332 myconf="${myconf} --without-berkeley-db"
338 else
339 if use berkdb ; then
340 myconf="${myconf} --with-berkeley-db=./bdb"
341 else
342 myconf="${myconf} --without-berkeley-db"
343 fi
344 fi 333 fi
345 334
346 if mysql_version_is_at_least "4.1.3" ; then 335 if mysql_version_is_at_least "4.1.3" ; then
347 myconf="${myconf} --with-geometry" 336 myconf="${myconf} --with-geometry"
348 myconf="${myconf} $(use_with cluster ndbcluster)" 337 myconf="${myconf} $(use_with cluster ndbcluster)"
363 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 352 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
364 if mysql_version_is_at_least "5.0.3" ; then 353 if mysql_version_is_at_least "5.0.3" ; then
365 elog "Before using the Federated storage engine, please be sure to read" 354 elog "Before using the Federated storage engine, please be sure to read"
366 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 355 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
367 myconf="${myconf} --with-federated-storage-engine" 356 myconf="${myconf} --with-federated-storage-engine"
357 fi
358 fi
359
360 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
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"
368 fi 366 fi
369 fi 367 fi
370 368
371 mysql_version_is_at_least "5.0.18" \ 369 mysql_version_is_at_least "5.0.18" \
372 && use max-idx-128 \ 370 && use max-idx-128 \
395 393
396 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"
397 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"
398 fi 396 fi
399 397
400 if use innodb ; then 398 # Upstream specifically requests that InnoDB always be built.
401 plugins="${plugins},innobase" 399 plugins="${plugins},innobase"
402 fi
403 400
404 # like configuration=max-no-ndb 401 # like configuration=max-no-ndb
405 if use cluster ; then 402 if use cluster ; then
406 plugins="${plugins},ndbcluster" 403 plugins="${plugins},ndbcluster"
407 myconf="${myconf} --with-ndb-binlog" 404 myconf="${myconf} --with-ndb-binlog"
441} 438}
442 439
443# 440#
444# EBUILD FUNCTIONS 441# EBUILD FUNCTIONS
445# 442#
446
447mysql_pkg_setup() { 443mysql_pkg_setup() {
448 enewgroup mysql 60 || die "problem adding 'mysql' group" 444 if hasq test ${FEATURES} ; then
449 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 445 if ! use minimal ; then
446 if [[ $UID -eq 0 ]]; then
447 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
448 fi
449 fi
450 fi
450 451
451 # Check for USE flag problems in pkg_setup 452 # Check for USE flag problems in pkg_setup
452 if use static && use ssl ; then 453 if use static && use ssl ; then
453 eerror "MySQL does not support being built statically with SSL support enabled!" 454 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!" 455 die "MySQL does not support being built statically with SSL support enabled!"
467 && use minimal ; then 468 && use minimal ; then
468 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 469 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 470 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
470 fi 471 fi
471 472
473 # This should come after all of the die statements
474 enewgroup mysql 60 || die "problem adding 'mysql' group"
475 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
476
472 mysql_check_version_range "4.0 to 5.0.99.99" \ 477 mysql_check_version_range "4.0 to 5.0.99.99" \
473 && use berkdb \ 478 && use berkdb \
474 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 479 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
475} 480}
476 481
477mysql_src_unpack() { 482mysql_src_unpack() {
478 # Initialize the proper variables first 483 # Initialize the proper variables first
479 mysql_init_vars 484 mysql_init_vars
480 485
481 unpack ${A} 486 unpack ${A}
482 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 487 # Grab the patches
483 if mysql_check_version_range "5.1 to 5.1.99" ; then 488 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
484 bitkeeper_fetch "mysql-5.1-ndb" 489
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}" 490 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
495 cd "${S}" 491 cd "${S}"
496 fi
497 492
498 # Apply the patches for this MySQL version 493 # Apply the patches for this MySQL version
499 EPATCH_SUFFIX="patch" 494 EPATCH_SUFFIX="patch"
500 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 495 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
496 # Clean out old items
497 rm -f "${EPATCH_SOURCE}"/*
498 # Now link in right patches
501 mysql_mv_patches 499 mysql_mv_patches
500 # And apply
502 epatch 501 epatch
503 502
504 # Additional checks, remove bundled zlib 503 # Additional checks, remove bundled zlib
505 rm -f "${S}/zlib/"*.[ch] 504 rm -f "${S}/zlib/"*.[ch]
506 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 505 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
522 521
523 local rebuilddirlist d 522 local rebuilddirlist d
524 523
525 if mysql_version_is_at_least "5.1.12" ; then 524 if mysql_version_is_at_least "5.1.12" ; then
526 rebuilddirlist="." 525 rebuilddirlist="."
527 # TODO: check this with a cmake expert 526 # TODO: check this with a cmake expert
528 use innodb \
529 && cmake \ 527 cmake \
530 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 528 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
531 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 529 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
532 "storage/innobase" 530 "storage/innobase"
533 else 531 else
534 rebuilddirlist=". innobase" 532 rebuilddirlist=". innobase"
535 fi 533 fi
536 534
544 if mysql_check_version_range "4.1 to 5.0.99.99" \ 542 if mysql_check_version_range "4.1 to 5.0.99.99" \
545 && use berkdb ; then 543 && use berkdb ; then
546 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 544 [[ -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" \ 545 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
548 || die "Could not copy libtool.m4 to bdb/dist/" 546 || die "Could not copy libtool.m4 to bdb/dist/"
547 #These files exist only with libtool-2*, and need to be included.
548 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
549 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
550 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
551 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
552 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
553 fi
549 pushd "bdb/dist" &>/dev/null 554 pushd "bdb/dist" &>/dev/null
550 sh s_all \ 555 sh s_all \
551 || die "Failed bdb reconfigure" 556 || die "Failed bdb reconfigure"
552 popd &>/dev/null 557 popd &>/dev/null
553 fi 558 fi
574 # Bug #114895, bug #110149 579 # Bug #114895, bug #110149
575 filter-flags "-O" "-O[01]" 580 filter-flags "-O" "-O[01]"
576 581
577 # glib-2.3.2_pre fix, bug #16496 582 # glib-2.3.2_pre fix, bug #16496
578 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 583 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
584
585 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
586 # fail badly during cluster startup.
587 if [[ $(gcc-major-version) -lt 4 ]]; then
588 filter-flags "-fstack-protector-all"
589 fi
579 590
580 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 591 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
581 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 592 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
582 mysql_version_is_at_least "5.0" \ 593 mysql_version_is_at_least "5.0" \
583 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 594 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
613 624
614 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"
615 626
616 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
617 628
618 insinto "${MY_INCLUDEDIR}"
619 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
620
621 # Convenience links 629 # Convenience links
630 einfo "Making Convenience links for mysqlcheck multi-call binary"
622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 631 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 632 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
624 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 633 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
625 634
626 # Various junk (my-*.cnf moved elsewhere) 635 # Various junk (my-*.cnf moved elsewhere)
636 einfo "Removing duplicate /usr/share/mysql files"
627 rm -Rf "${D}/usr/share/info" 637 rm -Rf "${D}/usr/share/info"
628 for removeme in "mysql-log-rotate" mysql.server* \ 638 for removeme in "mysql-log-rotate" mysql.server* \
629 binary-configure* my-*.cnf mi_test_all* 639 binary-configure* my-*.cnf mi_test_all*
630 do 640 do
631 rm -f "${D}"/usr/share/mysql/${removeme} 641 rm -f "${D}"/usr/share/mysql/${removeme}
632 done 642 done
633 643
634 # Clean up stuff for a minimal build 644 # Clean up stuff for a minimal build
635 if use minimal ; then 645 if use minimal ; then
646 einfo "Remove all extra content for minimal build"
636 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 647 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} 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}
638 rm -f "${D}/usr/sbin/mysqld" 649 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 650 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
640 fi 651 fi
643 if mysql_version_is_at_least "4.1" ; then 654 if mysql_version_is_at_least "4.1" ; then
644 mysql_mycnf_version="4.1" 655 mysql_mycnf_version="4.1"
645 else 656 else
646 mysql_mycnf_version="4.0" 657 mysql_mycnf_version="4.0"
647 fi 658 fi
659 einfo "Building default my.cnf"
648 insinto "${MY_SYSCONFDIR}" 660 insinto "${MY_SYSCONFDIR}"
649 doins scripts/mysqlaccess.conf 661 doins scripts/mysqlaccess.conf
650 sed -e "s!@DATADIR@!${DATADIR}!g" \ 662 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
651 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 663 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
652 > "${TMPDIR}/my.cnf.ok" 664 > "${TMPDIR}/my.cnf.ok"
653 if mysql_version_is_at_least "4.1" && use latin1 ; then 665 if mysql_version_is_at_least "4.1" && use latin1 ; then
654 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 666 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
655 fi 667 fi
656 newins "${TMPDIR}/my.cnf.ok" my.cnf 668 newins "${TMPDIR}/my.cnf.ok" my.cnf
657 669
658 # Minimal builds don't have the MySQL server 670 # Minimal builds don't have the MySQL server
659 if ! use minimal ; then 671 if ! use minimal ; then
672 einfo "Creating initial directories"
660 # Empty directories ... 673 # Empty directories ...
661 diropts "-m0750" 674 diropts "-m0750"
662 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 675 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
663 dodir "${DATADIR}" 676 dodir "${MY_DATADIR}"
664 keepdir "${DATADIR}" 677 keepdir "${MY_DATADIR}"
665 chown -R mysql:mysql "${D}/${DATADIR}" 678 chown -R mysql:mysql "${D}/${MY_DATADIR}"
666 fi 679 fi
667 680
668 diropts "-m0755" 681 diropts "-m0755"
669 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 682 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
670 dodir "${folder}" 683 dodir "${folder}"
672 chown -R mysql:mysql "${D}/${folder}" 685 chown -R mysql:mysql "${D}/${folder}"
673 done 686 done
674 fi 687 fi
675 688
676 # Docs 689 # Docs
690 einfo "Installing docs"
677 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 691 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
692 doinfo "${S}"/Docs/mysql.info
678 693
679 # Minimal builds don't have the MySQL server 694 # Minimal builds don't have the MySQL server
680 if ! use minimal ; then 695 if ! use minimal ; then
696 einfo "Including support files and sample configurations"
681 docinto "support-files" 697 docinto "support-files"
682 for script in \ 698 for script in \
683 support-files/my-*.cnf \ 699 "${S}"/support-files/my-*.cnf \
684 support-files/magic \ 700 "${S}"/support-files/magic \
685 support-files/ndb-config-2-node.ini 701 "${S}"/support-files/ndb-config-2-node.ini
686 do 702 do
687 dodoc "${script}" 703 dodoc "${script}"
688 done 704 done
689 705
690 docinto "scripts" 706 docinto "scripts"
691 for script in scripts/mysql* ; do 707 for script in "${S}"/scripts/mysql* ; do
692 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 708 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
693 done 709 done
710
694 fi 711 fi
695 712
696 mysql_lib_symlinks "${D}" 713 mysql_lib_symlinks "${D}"
697} 714}
698 715
755 && use berkdb \ 772 && use berkdb \
756 && 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!"
757} 774}
758 775
759mysql_pkg_config() { 776mysql_pkg_config() {
777 local old_MY_DATADIR="${MY_DATADIR}"
778
760 # Make sure the vars are correctly initialized 779 # Make sure the vars are correctly initialized
761 mysql_init_vars 780 mysql_init_vars
762 781
763 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 782 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
764 783
765 if built_with_use ${CATEGORY}/${PN} minimal ; then 784 if built_with_use ${CATEGORY}/${PN} minimal ; then
766 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
767 fi 810 fi
768 811
769 local pwd1="a" 812 local pwd1="a"
770 local pwd2="b" 813 local pwd2="b"
771 local maxtry=5 814 local maxtry=5
772 815
773 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 816 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
774 ewarn "You have already a MySQL database in place." 817 ewarn "You have already a MySQL database in place."
775 ewarn "(${ROOT}/${DATADIR}/*)" 818 ewarn "(${ROOT}/${MY_DATADIR}/*)"
776 ewarn "Please rename or delete it if you wish to replace it." 819 ewarn "Please rename or delete it if you wish to replace it."
777 die "MySQL database already exists!" 820 die "MySQL database already exists!"
778 fi 821 fi
822
823 # Bug #213475 - MySQL _will_ object strenously if your machine is named
824 # localhost. Also causes weird failures.
825 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
779 826
780 einfo "Creating the mysql database and setting proper" 827 einfo "Creating the mysql database and setting proper"
781 einfo "permissions on it ..." 828 einfo "permissions on it ..."
782 829
783 einfo "Insert a password for the mysql 'root' user" 830 einfo "Insert a password for the mysql 'root' user"
799 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 846 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
800 || touch "${TMPDIR}/fill_help_tables.sql" 847 || touch "${TMPDIR}/fill_help_tables.sql"
801 help_tables="${TMPDIR}/fill_help_tables.sql" 848 help_tables="${TMPDIR}/fill_help_tables.sql"
802 849
803 pushd "${TMPDIR}" &>/dev/null 850 pushd "${TMPDIR}" &>/dev/null
804 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 851 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
852 if [ $? -ne 0 ]; then
853 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
854 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
855 fi
805 popd &>/dev/null 856 popd &>/dev/null
806 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 857 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
807 || die "MySQL databases not installed" 858 || die "MySQL databases not installed"
808 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 859 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 860 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
810 861
811 if mysql_version_is_at_least "4.1.3" ; then 862 if mysql_version_is_at_least "4.1.3" ; then
812 options="--skip-ndbcluster" 863 options="--skip-ndbcluster"
813 864
814 # Filling timezones, see 865 # Filling timezones, see
825 local mysqld="${ROOT}/usr/sbin/mysqld \ 876 local mysqld="${ROOT}/usr/sbin/mysqld \
826 ${options} \ 877 ${options} \
827 --user=mysql \ 878 --user=mysql \
828 --skip-grant-tables \ 879 --skip-grant-tables \
829 --basedir=${ROOT}/usr \ 880 --basedir=${ROOT}/usr \
830 --datadir=${ROOT}/${DATADIR} \ 881 --datadir=${ROOT}/${MY_DATADIR} \
831 --skip-innodb \ 882 --skip-innodb \
832 --skip-bdb \ 883 --skip-bdb \
833 --skip-networking \ 884 --skip-networking \
834 --max_allowed_packet=8M \ 885 --max_allowed_packet=8M \
835 --net_buffer_length=16K \ 886 --net_buffer_length=16K \

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

  ViewVC Help
Powered by ViewVC 1.1.20