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

Diff of /eclass/mysql.eclass

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

Revision 1.72 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.72 2007/03/16 22:47:29 chtekk 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}
102 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
74 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 103 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
75mysql_version_is_at_least "5.1.12" \ 104mysql_version_is_at_least "5.1.12" \
76&& [[ -n "${PBXT_VERSION}" ]] \ 105&& [[ -n "${PBXT_VERSION}" ]] \
77&& 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 )"
78 107
79DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 108DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
80HOMEPAGE="http://www.mysql.com/" 109HOMEPAGE="http://www.mysql.com/"
81LICENSE="GPL-2" 110LICENSE="GPL-2"
82SLOT="0" 111SLOT="0"
83IUSE="big-tables debug embedded minimal perl selinux ssl static" 112IUSE="big-tables debug embedded minimal perl selinux ssl static"
84RESTRICT="confcache"
85 113
86mysql_version_is_at_least "4.1" \ 114mysql_version_is_at_least "4.1" \
87&& IUSE="${IUSE} latin1" 115&& IUSE="${IUSE} latin1"
88 116
89mysql_version_is_at_least "4.1.3" \ 117mysql_version_is_at_least "4.1.3" \
94 122
95mysql_version_is_at_least "5.0.18" \ 123mysql_version_is_at_least "5.0.18" \
96&& IUSE="${IUSE} max-idx-128" 124&& IUSE="${IUSE} max-idx-128"
97 125
98mysql_version_is_at_least "5.1" \ 126mysql_version_is_at_least "5.1" \
99&& IUSE="${IUSE} innodb"
100
101mysql_version_is_at_least "5.1" \
102|| IUSE="${IUSE} berkdb" 127|| IUSE="${IUSE} berkdb"
103 128
104mysql_version_is_at_least "5.1.12" \ 129mysql_version_is_at_least "5.1.12" \
105&& IUSE="${IUSE} pbxt" 130&& IUSE="${IUSE} pbxt"
106 131
107RDEPEND="${DEPEND} 132[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
108 !minimal? ( dev-db/mysql-init-scripts ) 133&& IUSE="${IUSE} community profiling"
109 selinux? ( sec-policy/selinux-mysql )"
110 134
111EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 135EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
112 pkg_postinst pkg_config pkg_postrm 136 pkg_postinst pkg_config pkg_postrm
113 137
114# 138#
115# HELPER FUNCTIONS: 139# HELPER FUNCTIONS:
116# 140#
117
118bitkeeper_fetch() {
119 local reposuf
120 if [[ -z "${1}" ]] ; then
121 local tpv
122 tpv=( ${PV//[-._]/ } )
123 reposuf="mysql-${tpv[0]}.${tpv[1]}"
124 else
125 reposuf="${1}"
126 fi
127 einfo "Using '${reposuf}' repository."
128 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
129 ## -- ebk_store_dir: bitkeeper sources store directory
130 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
131 ## -- ebk_fetch_cmd: bitkeeper fetch command
132 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
133 # hint: does not work
134 local ebk_fetch_cmd="sfioball"
135 ## -- ebk_update_cmd: bitkeeper update command
136 local ebk_update_cmd="update"
137
138 # addread "/etc/bitkeeper"
139 addwrite "${ebk_store_dir}"
140
141 if [[ ! -d "${ebk_store_dir}" ]] ; then
142 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
143 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
144 fi
145
146 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
147
148 local wc_path=${reposuf}
149
150 if [[ ! -d "${wc_path}" ]] ; then
151 local options="-r+"
152
153 # first checkout
154 einfo "bitkeeper checkout start -->"
155 einfo " repository: ${repo_uri}"
156
157 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
158 || die "BK: couldn't fetch from ${repo_uri}"
159 else
160 if [[ ! -d "${wc_path}/BK" ]] ; then
161 popd
162 die "Looks like ${wc_path} is not a bitkeeper path"
163 fi
164
165 # update working copy
166 einfo "bitkeeper update start -->"
167 einfo " repository: ${repo_uri}"
168
169 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
170 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
171 fi
172
173 einfo " working copy: ${wc_path}"
174 cd "${wc_path}"
175 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
176
177 echo
178 popd
179}
180 141
181mysql_disable_test() { 142mysql_disable_test() {
182 local testname="${1}" ; shift 143 local testname="${1}" ; shift
183 local reason="${@}" 144 local reason="${@}"
184 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 145 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
197 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 158 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
198 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 159 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
199 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 160 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
200 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 161 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
201 162
202 if [[ -z "${DATADIR}" ]] ; then 163 if [[ -z "${MY_DATADIR}" ]] ; then
203 DATADIR="" 164 MY_DATADIR=""
204 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 165 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
205 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 166 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
206 | sed -ne '/datadir/s|^--datadir=||p' \ 167 | sed -ne '/datadir/s|^--datadir=||p' \
207 | tail -n1` 168 | tail -n1`
208 if [[ -z "${DATADIR}" ]] ; then 169 if [[ -z "${MY_DATADIR}" ]] ; then
209 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 170 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
210 | sed -e 's/.*=\s*//'` 171 | sed -e 's/.*=\s*//' \
172 | tail -n1`
211 fi 173 fi
212 fi 174 fi
213 if [[ -z "${DATADIR}" ]] ; then 175 if [[ -z "${MY_DATADIR}" ]] ; then
214 DATADIR="${MY_LOCALSTATEDIR}" 176 MY_DATADIR="${MY_LOCALSTATEDIR}"
215 einfo "Using default DATADIR" 177 einfo "Using default MY_DATADIR"
216 fi 178 fi
217 elog "MySQL DATADIR is ${DATADIR}" 179 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
218 180
219 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 181 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
220 if [[ -e "${DATADIR}" ]] ; then 182 if [[ -e "${MY_DATADIR}" ]] ; then
221 elog "Previous datadir found, it's YOUR job to change" 183 # If you get this and you're wondering about it, see bug #207636
222 elog "ownership and take care of it" 184 elog "MySQL datadir found in ${MY_DATADIR}"
185 elog "A new one will not be created."
223 PREVIOUS_DATADIR="yes" 186 PREVIOUS_DATADIR="yes"
224 else 187 else
225 PREVIOUS_DATADIR="no" 188 PREVIOUS_DATADIR="no"
226 fi 189 fi
227 export PREVIOUS_DATADIR 190 export PREVIOUS_DATADIR
228 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
229 fi 206 fi
230 207
231 MY_SOURCEDIR=${SERVER_URI##*/} 208 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 209 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 210
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 211 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 212 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 213 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 214}
238 215
239configure_minimal() { 216configure_minimal() {
240 # These are things we exclude from a minimal build, please 217 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 218 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 219 # but we then delete it before packaging.
243 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"
244 221
245 for i in ${minimal_exclude_list} ; do 222 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 223 myconf="${myconf} --without-${i}"
247 done 224 done
248 myconf="${myconf} --with-extra-charsets=none" 225 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 226 myconf="${myconf} --enable-local-infile"
250 227
251 if use static ; then 228 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 229 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 230 myconf="${myconf} --disable-shared --with-pic"
254 else 231 else
255 myconf="${myconf} --enable-shared --enable-static" 232 myconf="${myconf} --enable-shared --enable-static"
256 fi 233 fi
257 234
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 235 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
274 myconf="${myconf} --without-libwrap" 251 myconf="${myconf} --without-libwrap"
275 252
276 if use static ; then 253 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 254 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 255 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 256 myconf="${myconf} --disable-shared --with-pic"
280 else 257 else
281 myconf="${myconf} --enable-shared --enable-static" 258 myconf="${myconf} --enable-shared --enable-static"
282 fi 259 fi
283 260
284 if use debug ; then 261 if use debug ; then
288 mysql_version_is_at_least "4.1.3" \ 265 mysql_version_is_at_least "4.1.3" \
289 && use cluster \ 266 && use cluster \
290 && myconf="${myconf} --without-ndb-debug" 267 && myconf="${myconf} --without-ndb-debug"
291 fi 268 fi
292 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}"
293 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 276 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
294 myconf="${myconf} --with-charset=utf8" 277 myconf="${myconf} --with-charset=utf8"
295 myconf="${myconf} --with-collation=utf8_general_ci" 278 myconf="${myconf} --with-collation=utf8_general_ci"
296 else 279 else
297 myconf="${myconf} --with-charset=latin1" 280 myconf="${myconf} --with-charset=latin1"
298 myconf="${myconf} --with-collation=latin1_swedish_ci" 281 myconf="${myconf} --with-collation=latin1_swedish_ci"
299 fi 282 fi
300 283
301 if use embedded ; then 284 if use embedded ; then
302 myconf="${myconf} --with-embedded-privilege-control" 285 myconf="${myconf} --with-embedded-privilege-control"
303 myconf="${myconf} --with-embedded-server" 286 myconf="${myconf} --with-embedded-server"
326 myconf="${myconf} $(use_with ssl)" 309 myconf="${myconf} $(use_with ssl)"
327 else 310 else
328 myconf="${myconf} $(use_with ssl openssl)" 311 myconf="${myconf} $(use_with ssl openssl)"
329 fi 312 fi
330 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
331 # 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:
332 # 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
333 # It comes down to non-64-bit safety problems. 324 # It comes down to non-64-bit safety problems.
334 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
335 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
336 myconf="${myconf} --without-berkeley-db" 332 myconf="${myconf} --without-berkeley-db"
337 else
338 if use berkdb ; then
339 myconf="${myconf} --with-berkeley-db=./bdb"
340 else
341 myconf="${myconf} --without-berkeley-db"
342 fi
343 fi 333 fi
344 334
345 if mysql_version_is_at_least "4.1.3" ; then 335 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 336 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 337 myconf="${myconf} $(use_with cluster ndbcluster)"
362 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 352 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
363 if mysql_version_is_at_least "5.0.3" ; then 353 if mysql_version_is_at_least "5.0.3" ; then
364 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"
365 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 355 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
366 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"
367 fi 366 fi
368 fi 367 fi
369 368
370 mysql_version_is_at_least "5.0.18" \ 369 mysql_version_is_at_least "5.0.18" \
371 && use max-idx-128 \ 370 && use max-idx-128 \
394 393
395 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"
396 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"
397 fi 396 fi
398 397
399 if use innodb ; then 398 # Upstream specifically requests that InnoDB always be built.
400 plugins="${plugins},innobase" 399 plugins="${plugins},innobase"
401 fi
402 400
403 # like configuration=max-no-ndb 401 # like configuration=max-no-ndb
404 if use cluster ; then 402 if use cluster ; then
405 plugins="${plugins},ndbcluster" 403 plugins="${plugins},ndbcluster"
406 myconf="${myconf} --with-ndb-binlog" 404 myconf="${myconf} --with-ndb-binlog"
440} 438}
441 439
442# 440#
443# EBUILD FUNCTIONS 441# EBUILD FUNCTIONS
444# 442#
445
446mysql_pkg_setup() { 443mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 444 if hasq test ${FEATURES} ; then
448 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
449 451
450 # Check for USE flag problems in pkg_setup 452 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 453 if use static && use ssl ; then
452 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!"
453 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!"
466 && use minimal ; then 468 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 469 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 470 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 fi 471 fi
470 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
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 477 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 478 && use berkdb \
473 && 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!"
474} 480}
475 481
476mysql_src_unpack() { 482mysql_src_unpack() {
477 # Initialize the proper variables first 483 # Initialize the proper variables first
478 mysql_init_vars 484 mysql_init_vars
479 485
480 unpack ${A} 486 unpack ${A}
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 487 # Grab the patches
482 if mysql_check_version_range "5.1 to 5.1.99" ; then 488 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
483 bitkeeper_fetch "mysql-5.1-ndb" 489
484 elif mysql_check_version_range "5.2 to 5.2.99" ; then
485 bitkeeper_fetch "mysql-5.2-falcon"
486 else
487 bitkeeper_fetch
488 fi
489 cd "${S}"
490 einfo "Running upstream autorun over BK sources ..."
491 BUILD/autorun.sh
492 else
493 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 490 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
494 cd "${S}" 491 cd "${S}"
495 fi
496 492
497 # Apply the patches for this MySQL version 493 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 494 EPATCH_SUFFIX="patch"
499 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
500 mysql_mv_patches 499 mysql_mv_patches
500 # And apply
501 epatch 501 epatch
502 502
503 # Additional checks, remove bundled zlib 503 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 504 rm -f "${S}/zlib/"*.[ch]
505 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"
521 521
522 local rebuilddirlist d 522 local rebuilddirlist d
523 523
524 if mysql_version_is_at_least "5.1.12" ; then 524 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 525 rebuilddirlist="."
526 # TODO: check this with a cmake expert 526 # TODO: check this with a cmake expert
527 use innodb \
528 && cmake \ 527 cmake \
529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 528 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 529 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 530 "storage/innobase"
532 else 531 else
533 rebuilddirlist=". innobase" 532 rebuilddirlist=". innobase"
534 fi 533 fi
535 534
543 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" \
544 && use berkdb ; then 543 && use berkdb ; then
545 [[ -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"
546 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" \
547 || 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
548 pushd "bdb/dist" &>/dev/null 554 pushd "bdb/dist" &>/dev/null
549 sh s_all \ 555 sh s_all \
550 || die "Failed bdb reconfigure" 556 || die "Failed bdb reconfigure"
551 popd &>/dev/null 557 popd &>/dev/null
552 fi 558 fi
573 # Bug #114895, bug #110149 579 # Bug #114895, bug #110149
574 filter-flags "-O" "-O[01]" 580 filter-flags "-O" "-O[01]"
575 581
576 # glib-2.3.2_pre fix, bug #16496 582 # glib-2.3.2_pre fix, bug #16496
577 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
578 590
579 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 591 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
580 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 592 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
581 mysql_version_is_at_least "5.0" \ 593 mysql_version_is_at_least "5.0" \
582 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 594 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
612 624
613 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"
614 626
615 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
616 628
617 insinto "${MY_INCLUDEDIR}"
618 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
619
620 # Convenience links 629 # Convenience links
630 einfo "Making Convenience links for mysqlcheck multi-call binary"
621 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 631 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 632 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 633 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
624 634
625 # Various junk (my-*.cnf moved elsewhere) 635 # Various junk (my-*.cnf moved elsewhere)
636 einfo "Removing duplicate /usr/share/mysql files"
626 rm -Rf "${D}/usr/share/info" 637 rm -Rf "${D}/usr/share/info"
627 for removeme in "mysql-log-rotate" mysql.server* \ 638 for removeme in "mysql-log-rotate" mysql.server* \
628 binary-configure* my-*.cnf mi_test_all* 639 binary-configure* my-*.cnf mi_test_all*
629 do 640 do
630 rm -f "${D}"/usr/share/mysql/${removeme} 641 rm -f "${D}"/usr/share/mysql/${removeme}
631 done 642 done
632 643
633 # Clean up stuff for a minimal build 644 # Clean up stuff for a minimal build
634 if use minimal ; then 645 if use minimal ; then
646 einfo "Remove all extra content for minimal build"
635 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 647 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
636 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}
637 rm -f "${D}/usr/sbin/mysqld" 649 rm -f "${D}/usr/sbin/mysqld"
638 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
639 fi 651 fi
642 if mysql_version_is_at_least "4.1" ; then 654 if mysql_version_is_at_least "4.1" ; then
643 mysql_mycnf_version="4.1" 655 mysql_mycnf_version="4.1"
644 else 656 else
645 mysql_mycnf_version="4.0" 657 mysql_mycnf_version="4.0"
646 fi 658 fi
659 einfo "Building default my.cnf"
647 insinto "${MY_SYSCONFDIR}" 660 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 661 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 662 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 663 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 664 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 665 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 666 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 667 fi
655 newins "${TMPDIR}/my.cnf.ok" my.cnf 668 newins "${TMPDIR}/my.cnf.ok" my.cnf
656 669
657 # Minimal builds don't have the MySQL server 670 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 671 if ! use minimal ; then
672 einfo "Creating initial directories"
659 # Empty directories ... 673 # Empty directories ...
660 diropts "-m0750" 674 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 675 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 676 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 677 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 678 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 679 fi
666 680
667 diropts "-m0755" 681 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 682 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 683 dodir "${folder}"
671 chown -R mysql:mysql "${D}/${folder}" 685 chown -R mysql:mysql "${D}/${folder}"
672 done 686 done
673 fi 687 fi
674 688
675 # Docs 689 # Docs
690 einfo "Installing docs"
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 691 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
692 doinfo "${S}"/Docs/mysql.info
677 693
678 # Minimal builds don't have the MySQL server 694 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 695 if ! use minimal ; then
696 einfo "Including support files and sample configurations"
680 docinto "support-files" 697 docinto "support-files"
681 for script in \ 698 for script in \
682 support-files/my-*.cnf \ 699 "${S}"/support-files/my-*.cnf \
683 support-files/magic \ 700 "${S}"/support-files/magic \
684 support-files/ndb-config-2-node.ini 701 "${S}"/support-files/ndb-config-2-node.ini
685 do 702 do
686 dodoc "${script}" 703 dodoc "${script}"
687 done 704 done
688 705
689 docinto "scripts" 706 docinto "scripts"
690 for script in scripts/mysql* ; do 707 for script in "${S}"/scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 708 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 709 done
710
693 fi 711 fi
694 712
695 mysql_lib_symlinks "${D}" 713 mysql_lib_symlinks "${D}"
696} 714}
697 715
754 && use berkdb \ 772 && use berkdb \
755 && 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!"
756} 774}
757 775
758mysql_pkg_config() { 776mysql_pkg_config() {
777 local old_MY_DATADIR="${MY_DATADIR}"
778
759 # Make sure the vars are correctly initialized 779 # Make sure the vars are correctly initialized
760 mysql_init_vars 780 mysql_init_vars
761 781
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 782 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 783
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 784 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 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
766 fi 810 fi
767 811
768 local pwd1="a" 812 local pwd1="a"
769 local pwd2="b" 813 local pwd2="b"
770 local maxtry=5 814 local maxtry=5
771 815
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 816 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 817 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 818 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 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."
776 die "MySQL database already exists!" 820 die "MySQL database already exists!"
777 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"
778 826
779 einfo "Creating the mysql database and setting proper" 827 einfo "Creating the mysql database and setting proper"
780 einfo "permissions on it ..." 828 einfo "permissions on it ..."
781 829
782 einfo "Insert a password for the mysql 'root' user" 830 einfo "Insert a password for the mysql 'root' user"
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 846 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 847 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 848 help_tables="${TMPDIR}/fill_help_tables.sql"
801 849
802 pushd "${TMPDIR}" &>/dev/null 850 pushd "${TMPDIR}" &>/dev/null
803 "${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
804 popd &>/dev/null 856 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 857 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 858 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 859 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 860 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 861
810 if mysql_version_is_at_least "4.1.3" ; then 862 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 863 options="--skip-ndbcluster"
812 864
813 # Filling timezones, see 865 # Filling timezones, see
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 876 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 877 ${options} \
826 --user=mysql \ 878 --user=mysql \
827 --skip-grant-tables \ 879 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 880 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 881 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 882 --skip-innodb \
831 --skip-bdb \ 883 --skip-bdb \
832 --skip-networking \ 884 --skip-networking \
833 --max_allowed_packet=8M \ 885 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 886 --net_buffer_length=16K \

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

  ViewVC Help
Powered by ViewVC 1.1.20