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

Diff of /eclass/mysql.eclass

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

Revision 1.68 Revision 1.84
1# Copyright 1999-2006 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.68 2007/01/12 17:00:39 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.84 2008/01/16 04:01:14 robbat2 Exp $
4# kate: encoding utf-8; eol unix;
5# kate: indent-width 4; mixedindent off; remove-trailing-space on; space-indent off;
6# kate: word-wrap-column 80; word-wrap off;
7 4
8# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
9# Maintainer: Luca Longinotti <chtekk@gentoo.org> 6# Maintainer: Luca Longinotti <chtekk@gentoo.org>
10 7
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
11# Note that MYSQL_VERSION_ID must be empty !!! 9# Note that MYSQL_VERSION_ID must be empty!
12 10
13ECLASS="mysql"
14INHERITED="$INHERITED $ECLASS"
15WANT_AUTOCONF="latest" 11WANT_AUTOCONF="latest"
16WANT_AUTOMAKE="latest" 12WANT_AUTOMAKE="latest"
13
17inherit eutils flag-o-matic gnuconfig autotools mysql_fx 14inherit eutils flag-o-matic gnuconfig autotools mysql_fx
18 15
19# Shorten the path because the socket path length must be shorter than 107 chars 16# Shorten the path because the socket path length must be shorter than 107 chars
20# and we will run a mysql server during test phase 17# and we will run a mysql server during test phase
21S="${WORKDIR}/mysql" 18S="${WORKDIR}/mysql"
33# MYSQL_VERSION_ID will be: 30# MYSQL_VERSION_ID will be:
34# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
35# This is an important part, because many of the choices the MySQL ebuild will do 32# This is an important part, because many of the choices the MySQL ebuild will do
36# depend on this variable. 33# depend on this variable.
37# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
35
38MYSQL_VERSION_ID="" 36MYSQL_VERSION_ID=""
39tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
40for vatom in 0 1 2 3 ; do 38for vatom in 0 1 2 3 ; do
41 # pad to length 2 39 # pad to length 2
42 tpv[${vatom}]="00${tpv[${vatom}]}" 40 tpv[${vatom}]="00${tpv[${vatom}]}"
49DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
50 userland_GNU? ( sys-process/procps ) 48 userland_GNU? ( sys-process/procps )
51 >=sys-apps/sed-4 49 >=sys-apps/sed-4
52 >=sys-apps/texinfo-4.7-r1 50 >=sys-apps/texinfo-4.7-r1
53 >=sys-libs/readline-4.1 51 >=sys-libs/readline-4.1
54 >=sys-libs/zlib-1.2.3 52 >=sys-libs/zlib-1.2.3"
55 "
56 53
57# having different flavours at the same time is not a good idea 54# Having different flavours at the same time is not a good idea
58for i in "" "-community" "-slotted" ; do 55for i in "" "-community" ; do
59 [[ "${i}" == ${PN#mysql} ]] || 56 [[ "${i}" == ${PN#mysql} ]] ||
60 DEPEND="${DEPEND} !dev-db/mysql${i}" 57 DEPEND="${DEPEND} !dev-db/mysql${i}"
61done 58done
62 59
63mysql_version_is_at_least "5.1" \ 60mysql_version_is_at_least "5.1" \
64|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
65 62
63mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
65
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 68
69if mysql_version_is_at_least "5.1.12" ; then
70 DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
71fi
72
73# BitKeeper dependency, compile-time only 69# BitKeeper dependency, compile-time only
74[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
75 71
72# Work out the default SERVER_URI correctly
73if [ -z "${SERVER_URI}" ]; then
74 # The community build is on the mirrors
75 if [ "${PN}" == "mysql-community" ]; then
76 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
77 # The enterprise source is on the primary site only
76if [[ ${PN} == "mysql-slotted" ]] ; then 78 elif [ "${PN}" == "mysql" ]; then
77 DEPEND="${DEPEND} app-admin/eselect-mysql" 79 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
80 fi
78fi 81fi
79 82
80if [[ ${PN} == "mysql-slotted" ]] ; then
81 SLOT=""
82 tpv=( ${PV//[-._]/ } )
83 for vatom in 0 1 2 ; do
84 SLOT="${SLOT}${tpv[${vatom}]}_"
85 done
86 #finally SLOT=5_0_24
87 SLOT=${SLOT:0:${#SLOT}-1}
88else
89 SLOT="0"
90fi
91
92# Define correct SRC_URIs 83# Define correct SRC_URIs
93SRC_URI=" 84SRC_URI="${SERVER_URI}
94${SERVER_URI} 85 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
95http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 86 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
96"
97mysql_version_is_at_least "5.1.12" \ 87mysql_version_is_at_least "5.1.12" \
98&& [[ -n "${PBXT_VERSION}" ]] \ 88&& [[ -n "${PBXT_VERSION}" ]] \
99&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 89&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
100 90
101DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 91DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
102HOMEPAGE="http://www.mysql.com/" 92HOMEPAGE="http://www.mysql.com/"
103LICENSE="GPL-2" 93LICENSE="GPL-2"
94SLOT="0"
104IUSE="big-tables debug embedded minimal perl selinux ssl static" 95IUSE="big-tables debug embedded minimal perl selinux ssl static"
105RESTRICT="confcache"
106 96
107mysql_version_is_at_least "4.1" \ 97mysql_version_is_at_least "4.1" \
108&& IUSE="${IUSE} latin1" 98&& IUSE="${IUSE} latin1"
109 99
110mysql_version_is_at_least "4.1.3" \ 100mysql_version_is_at_least "4.1.3" \
135# 125#
136# HELPER FUNCTIONS: 126# HELPER FUNCTIONS:
137# 127#
138 128
139bitkeeper_fetch() { 129bitkeeper_fetch() {
140
141 local reposuf 130 local reposuf
142 if [[ -z "${1}" ]] ; then 131 if [[ -z "${1}" ]] ; then
143 local tpv 132 local tpv
144 tpv=( ${PV//[-._]/ } ) 133 tpv=( ${PV//[-._]/ } )
145 reposuf="mysql-${tpv[0]}.${tpv[1]}" 134 reposuf="mysql-${tpv[0]}.${tpv[1]}"
146 else 135 else
147 reposuf="${1}" 136 reposuf="${1}"
148 fi 137 fi
149 einfo "using \"${reposuf}\" repository." 138 einfo "Using '${reposuf}' repository."
150 local repo_uri="bk://mysql.bkbits.net/${reposuf}" 139 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
151 ## -- ebk_store_dir: bitkeeper sources store directory 140 ## -- ebk_store_dir: bitkeeper sources store directory
152 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src" 141 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
153 ## -- ebk_fetch_cmd: bitkeeper fetch command 142 ## -- ebk_fetch_cmd: bitkeeper fetch command
154 # always fetch the latest revision, use -r<revision> if a specified revision is wanted 143 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
155 # hint: does not work 144 # hint: does not work
156 local ebk_fetch_cmd="sfioball" 145 local ebk_fetch_cmd="sfioball"
157 ## -- ebk_update_cmd: bitkeeper update command 146 ## -- ebk_update_cmd: bitkeeper update command
158 local ebk_update_cmd="update" 147 local ebk_update_cmd="update"
159 148
160 #addread "/etc/bitkeeper" 149 # addread "/etc/bitkeeper"
161 addwrite "${ebk_store_dir}" 150 addwrite "${ebk_store_dir}"
162 151
163 if [[ ! -d "${ebk_store_dir}" ]]; then 152 if [[ ! -d "${ebk_store_dir}" ]] ; then
164 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory" 153 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
165 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}." 154 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
166 fi 155 fi
167 156
168 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}" 157 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
169 158
170 local wc_path=${reposuf} 159 local wc_path=${reposuf}
171 160
172 if [[ ! -d "${wc_path}" ]]; then 161 if [[ ! -d "${wc_path}" ]] ; then
173 local options="-r+" 162 local options="-r+"
163
174 # first check out 164 # first checkout
175 einfo "bitkeeper check out start -->" 165 einfo "bitkeeper checkout start -->"
176 elog " repository: ${repo_uri}" 166 einfo " repository: ${repo_uri}"
167
177 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \ 168 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
178 || die "${EBK}: can't fetch from ${repo_uri}." 169 || die "BK: couldn't fetch from ${repo_uri}"
179 else 170 else
180 if [[ ! -d "${wc_path}/BK" ]]; then 171 if [[ ! -d "${wc_path}/BK" ]] ; then
181 popd 172 popd
182 die "Look like ${wc_path} is not a bitkeeper path." 173 die "Looks like ${wc_path} is not a bitkeeper path"
183 fi 174 fi
184 175
185 # update working copy 176 # update working copy
186 einfo "bitkeeper update start -->" 177 einfo "bitkeeper update start -->"
187 elog " repository: ${repo_uri}" 178 einfo " repository: ${repo_uri}"
188 179
189 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \ 180 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
190 || die "BK: can't update from ${repo_uri} to ${wc_path}." 181 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
191 fi 182 fi
192 183
193 einfo " working copy: ${wc_path}" 184 einfo " working copy: ${wc_path}"
194 cd "${wc_path}" 185 cd "${wc_path}"
195 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}." 186 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
196 187
197 echo 188 echo
198 popd 189 popd
199
200} 190}
201 191
202mysql_disable_test() { 192mysql_disable_test() {
203 local testname="${1}" ; shift 193 local testname="${1}" ; shift
204 local reason="${@}" 194 local reason="${@}"
205 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 195 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
206 echo ${testname} : ${reason} >> "${mysql_disable_file}" 196 echo ${testname} : ${reason} >> "${mysql_disable_file}"
207 ewarn "test \"${testname}\" disabled because: \"${reason}\"" 197 ewarn "test '${testname}' disabled: '${reason}'"
208} 198}
209 199
210# void mysql_init_vars() 200# void mysql_init_vars()
211# 201#
212# Initialize global variables 202# Initialize global variables
213# 2005-11-19 <vivo@gentoo.org> 203# 2005-11-19 <vivo@gentoo.org>
214 204
215mysql_init_vars() { 205mysql_init_vars() {
216 if [[ ${SLOT} == "0" ]] ; then
217 MY_SUFFIX=""
218 else
219 MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
220 fi
221 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"} 206 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
222 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"} 207 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
223 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"} 208 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
224 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"} 209 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
225 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"} 210 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
226 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"} 211 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
227 212
228 if [[ -z "${DATADIR}" ]] ; then 213 if [[ -z "${MY_DATADIR}" ]] ; then
229 DATADIR="" 214 MY_DATADIR=""
230 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 215 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
231 DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null \ 216 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
232 | sed -ne '/datadir/s|^--datadir=||p' \ 217 | sed -ne '/datadir/s|^--datadir=||p' \
233 | tail -n1` 218 | tail -n1`
234 if [[ -z "${DATADIR}" ]] ; then 219 if [[ -z "${MY_DATADIR}" ]] ; then
235 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 220 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
236 | sed -e 's/.*=\s*//'` 221 | sed -e 's/.*=\s*//'`
237 fi 222 fi
238 fi 223 fi
239 if [[ -z "${DATADIR}" ]] ; then 224 if [[ -z "${MY_DATADIR}" ]] ; then
240 DATADIR="${MY_LOCALSTATEDIR}" 225 MY_DATADIR="${MY_LOCALSTATEDIR}"
241 einfo "Using default DATADIR" 226 einfo "Using default MY_DATADIR"
242 fi 227 fi
243 elog "MySQL DATADIR is ${DATADIR}" 228 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
244 229
245 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 230 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
246 if [[ -e "${DATADIR}" ]] ; then 231 if [[ -e "${MY_DATADIR}" ]] ; then
247 elog "Previous datadir found, it's YOUR job to change" 232 elog "Previous datadir found, it's YOUR job to change"
248 elog "ownership and take care of it" 233 elog "ownership and take care of it"
249 PREVIOUS_DATADIR="yes" 234 PREVIOUS_DATADIR="yes"
250 else 235 else
251 PREVIOUS_DATADIR="no" 236 PREVIOUS_DATADIR="no"
255 fi 240 fi
256 241
257 MY_SOURCEDIR=${SERVER_URI##*/} 242 MY_SOURCEDIR=${SERVER_URI##*/}
258 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 243 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
259 244
260 export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR 245 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
261 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 246 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
262 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 247 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
263} 248}
264 249
265configure_minimal() { 250configure_minimal() {
266 # These are things we exclude from a minimal build, please 251 # These are things we exclude from a minimal build, please
267 # note that the server actually does get built and installed, 252 # note that the server actually does get built and installed,
268 # but we then delete it before packaging. 253 # but we then delete it before packaging.
269 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 254 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
270 255
271 for i in ${minimal_exclude_list} ; do 256 for i in ${minimal_exclude_list} ; do
272 myconf="${myconf} --without-${i}" 257 myconf="${myconf} --without-${i}"
273 done 258 done
274 myconf="${myconf} --with-extra-charsets=none" 259 myconf="${myconf} --with-extra-charsets=none"
275 myconf="${myconf} --enable-local-infile" 260 myconf="${myconf} --enable-local-infile"
276 261
277 if use static ; then 262 if use static ; then
278 myconf="${myconf} --with-client-ldflags=-all-static" 263 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 264 myconf="${myconf} --disable-shared --with-pic"
280 else 265 else
281 myconf="${myconf} --enable-shared --enable-static" 266 myconf="${myconf} --enable-shared --enable-static"
282 fi 267 fi
283 268
284 if mysql_version_is_at_least "4.01.00.00" && ! use latin1 ; then 269 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
285 myconf="${myconf} --with-charset=utf8" 270 myconf="${myconf} --with-charset=utf8"
286 myconf="${myconf} --with-collation=utf8_general_ci" 271 myconf="${myconf} --with-collation=utf8_general_ci"
287 else 272 else
288 myconf="${myconf} --with-charset=latin1" 273 myconf="${myconf} --with-charset=latin1"
289 myconf="${myconf} --with-collation=latin1_swedish_ci" 274 myconf="${myconf} --with-collation=latin1_swedish_ci"
300 myconf="${myconf} --without-libwrap" 285 myconf="${myconf} --without-libwrap"
301 286
302 if use static ; then 287 if use static ; then
303 myconf="${myconf} --with-mysqld-ldflags=-all-static" 288 myconf="${myconf} --with-mysqld-ldflags=-all-static"
304 myconf="${myconf} --with-client-ldflags=-all-static" 289 myconf="${myconf} --with-client-ldflags=-all-static"
305 myconf="${myconf} --disable-shared" 290 myconf="${myconf} --disable-shared --with-pic"
306 else 291 else
307 myconf="${myconf} --enable-shared --enable-static" 292 myconf="${myconf} --enable-shared --enable-static"
308 fi 293 fi
309 294
310 if use debug ; then 295 if use debug ; then
340 myconf="${myconf} --with-extra-tools" 325 myconf="${myconf} --with-extra-tools"
341 myconf="${myconf} --with-innodb" 326 myconf="${myconf} --with-innodb"
342 myconf="${myconf} --without-readline" 327 myconf="${myconf} --without-readline"
343 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 328 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
344 329
330 # --with-vio is not needed anymore, it's on by default and
331 # has been removed from configure
345 if use ssl ; then 332 if use ssl ; then
346 # --with-vio is not needed anymore, it's on by default and
347 # has been removed from configure
348 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 333 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
349 fi 334 fi
350 335
351 if mysql_version_is_at_least "5.1.11" ; then 336 if mysql_version_is_at_least "5.1.11" ; then
352 myconf="${myconf} $(use_with ssl)" 337 myconf="${myconf} $(use_with ssl)"
353 else 338 else
354 myconf="${myconf} $(use_with ssl openssl)" 339 myconf="${myconf} $(use_with ssl openssl)"
355 fi 340 fi
356 341
342 if use berkdb ; then
357 # 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:
358 # 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
359 # It comes down to non-64-bit safety problems. 345 # It comes down to non-64-bit safety problems.
360 if use sparc || use alpha || use hppa || use mips || use amd64 ; then 346 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
361 elog "Berkeley DB support was disabled due to incompatible arch" 347 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
348 myconf="${myconf} --without-berkeley-db"
349 else
350 myconf="${myconf} --with-berkeley-db=./bdb"
351 fi
352 else
362 myconf="${myconf} --without-berkeley-db" 353 myconf="${myconf} --without-berkeley-db"
363 else
364 if use berkdb ; then
365 myconf="${myconf} --with-berkeley-db=./bdb"
366 else
367 myconf="${myconf} --without-berkeley-db"
368 fi
369 fi 354 fi
370 355
371 if mysql_version_is_at_least "4.1.3" ; then 356 if mysql_version_is_at_least "4.1.3" ; then
372 myconf="${myconf} --with-geometry" 357 myconf="${myconf} --with-geometry"
373 myconf="${myconf} $(use_with cluster ndbcluster)" 358 myconf="${myconf} $(use_with cluster ndbcluster)"
445 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 430 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
446 431
447 einfo "Reconfiguring dir '${PWD}'" 432 einfo "Reconfiguring dir '${PWD}'"
448 AT_GNUCONF_UPDATE="yes" eautoreconf 433 AT_GNUCONF_UPDATE="yes" eautoreconf
449 434
450 local myconf 435 local myconf=""
451 myconf="${myconf} --with-mysql=${S}"
452 mkdir -p ${T}/lib
453 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 436 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
454 use debug && myconf="${myconf} --with-debug=full" 437 use debug && myconf="${myconf} --with-debug=full"
455 # TODO is safe/needed to use econf here ? 438 # TODO: is it safe/needed to use econf here ?
456 ./configure ${myconf} || die "problem configuring pbxt storage engine" 439 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
457 # TODO is safe/needed to use emake here ? 440 # TODO: is it safe/needed to use emake here ?
458 make || die "problem making pbxt storage engine (${myconf})" 441 make || die "Problem making PBXT storage engine (${myconf})"
459 442
460 popd 443 popd
461 # TODO: modify test suite 444 # TODO: modify test suite for PBXT
462} 445}
463 446
464pbxt_src_install() { 447pbxt_src_install() {
465 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 448 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
466 make install || die "failed pbxt install" 449 make install || die "Failed to install PBXT"
467 popd 450 popd
468} 451}
469 452
470# 453#
471# EBUILD FUNCTIONS 454# EBUILD FUNCTIONS
472# 455#
473
474mysql_pkg_setup() { 456mysql_pkg_setup() {
475 enewgroup mysql 60 || die "problem adding 'mysql' group" 457 if hasq test ${FEATURES} ; then
476 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 458 if ! use minimal ; then
459 if ! hasq userpriv ${FEATURES} ; then
460 die "Testing with FEATURES=-userpriv is no longer supported by upstream"
461 fi
462 fi
463 fi
477 464
478 # Check for USE flag problems in pkg_setup 465 # Check for USE flag problems in pkg_setup
479 if use static && use ssl ; then 466 if use static && use ssl ; then
480 eerror "MySQL does not support being built statically with SSL support enabled!" 467 eerror "MySQL does not support being built statically with SSL support enabled!"
481 die "MySQL does not support being built statically with SSL support enabled!" 468 die "MySQL does not support being built statically with SSL support enabled!"
493 && ( use cluster || use extraengine ) \ 480 && ( use cluster || use extraengine ) \
494 && use minimal ; then 481 && use minimal ; then
495 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 482 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
496 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 483 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
497 fi 484 fi
485
486 # This should come after all of the die statements
487 enewgroup mysql 60 || die "problem adding 'mysql' group"
488 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
498 489
499 mysql_check_version_range "4.0 to 5.0.99.99" \ 490 mysql_check_version_range "4.0 to 5.0.99.99" \
500 && use berkdb \ 491 && use berkdb \
501 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 492 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
502} 493}
507 498
508 unpack ${A} 499 unpack ${A}
509 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 500 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
510 if mysql_check_version_range "5.1 to 5.1.99" ; then 501 if mysql_check_version_range "5.1 to 5.1.99" ; then
511 bitkeeper_fetch "mysql-5.1-ndb" 502 bitkeeper_fetch "mysql-5.1-ndb"
512 elif mysql_check_version_range "5.2.0 to 5.2.99" ; then 503 elif mysql_check_version_range "5.2 to 5.2.99" ; then
513 bitkeeper_fetch "mysql-5.2-falcon" 504 bitkeeper_fetch "mysql-5.2-falcon"
514 else 505 else
515 bitkeeper_fetch 506 bitkeeper_fetch
516 fi 507 fi
517 cd "${S}" 508 cd "${S}"
518 einfo "running upstream autorun on bk sources" 509 einfo "Running upstream autorun over BK sources ..."
519 BUILD/autorun.sh 510 BUILD/autorun.sh
520 else 511 else
521 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 512 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
522 cd "${S}" 513 cd "${S}"
523 fi 514 fi
524 515
525 # Apply the patches for this MySQL version 516 # Apply the patches for this MySQL version
526 EPATCH_SUFFIX="patch" 517 EPATCH_SUFFIX="patch"
527 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 518 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
528 mysql_mv_patches 519 mysql_mv_patches
529 epatch || die "failed to apply all patches" 520 epatch
530 521
531 # Additional checks, remove bundled zlib 522 # Additional checks, remove bundled zlib
532 rm -f "${S}/zlib/"*.[ch] 523 rm -f "${S}/zlib/"*.[ch]
533 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 524 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
534 rm -f "scripts/mysqlbug" 525 rm -f "scripts/mysqlbug"
549 540
550 local rebuilddirlist d 541 local rebuilddirlist d
551 542
552 if mysql_version_is_at_least "5.1.12" ; then 543 if mysql_version_is_at_least "5.1.12" ; then
553 rebuilddirlist="." 544 rebuilddirlist="."
554 # TODO IMPO! Check this with a cmake expert 545 # TODO: check this with a cmake expert
555 use innodb \ 546 use innodb \
556 && cmake \ 547 && cmake \
557 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 548 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
558 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 549 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
559 "storage/innobase" 550 "storage/innobase"
560 else 551 else
561 rebuilddirlist=". innobase" 552 rebuilddirlist=". innobase"
562 fi 553 fi
563 554
569 done 560 done
570 561
571 if mysql_check_version_range "4.1 to 5.0.99.99" \ 562 if mysql_check_version_range "4.1 to 5.0.99.99" \
572 && use berkdb ; then 563 && use berkdb ; then
573 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 564 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
565 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
566 || die "Could not copy libtool.m4 to bdb/dist/"
574 pushd "bdb/dist" \ 567 pushd "bdb/dist" &>/dev/null
575 && sh s_all \ 568 sh s_all \
576 || die "Failed bdb reconfigure" \ 569 || die "Failed bdb reconfigure"
577 &>/dev/null
578 popd &>/dev/null 570 popd &>/dev/null
579 fi 571 fi
580} 572}
581 573
582mysql_src_compile() { 574mysql_src_compile() {
608 mysql_version_is_at_least "5.0" \ 600 mysql_version_is_at_least "5.0" \
609 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 601 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
610 export CXXFLAGS 602 export CXXFLAGS
611 603
612 econf \ 604 econf \
613 --program-suffix="${MY_SUFFIX}" \
614 --libexecdir="/usr/sbin" \ 605 --libexecdir="/usr/sbin" \
615 --sysconfdir="${MY_SYSCONFDIR}" \ 606 --sysconfdir="${MY_SYSCONFDIR}" \
616 --localstatedir="${MY_LOCALSTATEDIR}" \ 607 --localstatedir="${MY_LOCALSTATEDIR}" \
617 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 608 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
618 --libdir="${MY_LIBDIR}" \ 609 --libdir="${MY_LIBDIR}" \
636 627
637mysql_src_install() { 628mysql_src_install() {
638 # Make sure the vars are correctly initialized 629 # Make sure the vars are correctly initialized
639 mysql_init_vars 630 mysql_init_vars
640 631
641 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 632 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
642 633
643 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 634 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
644 635
645 insinto "${MY_INCLUDEDIR}" 636 insinto "${MY_INCLUDEDIR}"
646 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h 637 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
647 638
648 # Convenience links 639 # Convenience links
649 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 640 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
650 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 641 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
651 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 642 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
652 643
653 # Various junk (my-*.cnf moved elsewhere) 644 # Various junk (my-*.cnf moved elsewhere)
654 rm -Rf "${D}/usr/share/info" 645 rm -Rf "${D}/usr/share/info"
655 for removeme in "mysql-log-rotate" mysql.server* \ 646 for removeme in "mysql-log-rotate" mysql.server* \
656 binary-configure* my-*.cnf mi_test_all* 647 binary-configure* my-*.cnf mi_test_all*
657 do 648 do
658 rm -f "${D}"/usr/share/mysql/${removeme} 649 rm -f "${D}"/usr/share/mysql/${removeme}
659 done 650 done
660 651
661 # TODO change at Makefile-am level
662 if [[ ${PN} == "mysql-slotted" ]] ; then
663 for moveme in "mysql_fix_privilege_tables.sql" \
664 "fill_help_tables.sql" "ndb-config-2-node.ini"
665 do
666 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
667 done
668 fi
669
670 # clean up stuff for a minimal build 652 # Clean up stuff for a minimal build
671 if use minimal ; then 653 if use minimal ; then
672 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 654 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
673 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} 655 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}
674 rm -f "${D}/usr/sbin/mysqld" 656 rm -f "${D}/usr/sbin/mysqld"
675 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 657 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
676 fi 658 fi
677 659
678 if [[ ${PN} == "mysql-slotted" ]] ; then
679 local notcatched=$(ls "${D}/usr/share/mysql"/*)
680 if [[ -n "${notcatched}" ]] ; then
681 ewarn "QA notice"
682 ewarn "${notcatched} files in /usr/share/mysql"
683 ewarn "bug mysql-herd to manage them"
684 fi
685 rm -Rf "${D}/usr/share/mysql"
686 fi
687
688 # Configuration stuff 660 # Configuration stuff
689 if mysql_version_is_at_least "4.1" ; then 661 if mysql_version_is_at_least "4.1" ; then
690 mysql_mycnf_version="4.1" 662 mysql_mycnf_version="4.1"
691 else 663 else
692 mysql_mycnf_version="4.0" 664 mysql_mycnf_version="4.0"
693 fi 665 fi
694 insinto "${MY_SYSCONFDIR}" 666 insinto "${MY_SYSCONFDIR}"
695 doins scripts/mysqlaccess.conf 667 doins scripts/mysqlaccess.conf
696 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \
697 -e "s!@DATADIR@!${DATADIR}!g" \ 668 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
698 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 669 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
699 > "${TMPDIR}/my.cnf.ok" 670 > "${TMPDIR}/my.cnf.ok"
700 if mysql_version_is_at_least "4.1" && use latin1 ; then 671 if mysql_version_is_at_least "4.1" && use latin1 ; then
701 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 672 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
702 fi 673 fi
705 # Minimal builds don't have the MySQL server 676 # Minimal builds don't have the MySQL server
706 if ! use minimal ; then 677 if ! use minimal ; then
707 # Empty directories ... 678 # Empty directories ...
708 diropts "-m0750" 679 diropts "-m0750"
709 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 680 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
710 dodir "${DATADIR}" 681 dodir "${MY_DATADIR}"
711 keepdir "${DATADIR}" 682 keepdir "${MY_DATADIR}"
712 chown -R mysql:mysql "${D}/${DATADIR}" 683 chown -R mysql:mysql "${D}/${MY_DATADIR}"
713 fi 684 fi
714 685
715 diropts "-m0755" 686 diropts "-m0755"
716 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 687 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
717 dodir "${folder}" 688 dodir "${folder}"
720 done 691 done
721 fi 692 fi
722 693
723 # Docs 694 # Docs
724 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 695 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
696 doinfo ${S}/Docs/mysql.info
725 697
726 # Minimal builds don't have the MySQL server 698 # Minimal builds don't have the MySQL server
727 if ! use minimal ; then 699 if ! use minimal ; then
728 docinto "support-files" 700 docinto "support-files"
729 for script in \ 701 for script in \
736 708
737 docinto "scripts" 709 docinto "scripts"
738 for script in scripts/mysql* ; do 710 for script in scripts/mysql* ; do
739 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 711 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
740 done 712 done
741 fi
742 713
743 if [[ ${PN} == "mysql-slotted" ]] ; then
744 # MOVED HERE DUE TO BUG #121445
745 # create a list of files, to be used
746 # by external utilities
747 mkdir -p "${D}/var/lib/eselect/mysql/"
748 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
749 pushd "${D}/" &>/dev/null
750 find usr/bin/ usr/sbin/ \
751 -type f -name "*${MY_SUFFIX}*" \
752 -and -not -name "mysql_config${MY_SUFFIX}" \
753 > "${filelist}"
754 find usr/share/man \
755 -type f -name "*${MY_SUFFIX}*" \
756 | sed -e 's/$/.gz/' \
757 >> "${filelist}"
758 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
759 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
760 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
761 popd &>/dev/null
762 fi 714 fi
763 715
764 mysql_lib_symlinks "${D}" 716 mysql_lib_symlinks "${D}"
765} 717}
766 718
772mysql_pkg_postinst() { 724mysql_pkg_postinst() {
773 # Make sure the vars are correctly initialized 725 # Make sure the vars are correctly initialized
774 mysql_init_vars 726 mysql_init_vars
775 727
776 # Check FEATURES="collision-protect" before removing this 728 # Check FEATURES="collision-protect" before removing this
777 [[ -d "${ROOT}/var/log/mysql" ]] \
778 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 729 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
779 730
780 # Secure the logfiles 731 # Secure the logfiles
781 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 732 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
782 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 733 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
783 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 734 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
795 746
796 docinto "scripts" 747 docinto "scripts"
797 for script in scripts/mysql* ; do 748 for script in scripts/mysql* ; do
798 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 749 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
799 done 750 done
800 fi
801 751
802 #einfo "you may want to read slotting upgrade documents in the overlay" 752 einfo
753 elog "You might want to run:"
754 elog "\"emerge --config =${CATEGORY}/${PF}\""
755 elog "if this is a new install."
756 einfo
757 fi
758
803 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 759 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
804 # TODO tell it better ;-) 760 # TODO: explain it better
805 elog "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 761 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
806 elog "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 762 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
807 elog "if, after that you cannot start the mysql server" 763 elog "if, after that, you cannot start the MySQL server,"
808 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 764 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
809 elog "use the mysql upgrade script to restore the table" 765 elog "use the MySQL upgrade script to restore the table"
810 elog " or " 766 elog "or execute the following SQL command:"
811 elog "CREATE TABLE IF NOT EXISTS plugin (" 767 elog " CREATE TABLE IF NOT EXISTS plugin ("
812 elog " name char(64) binary DEFAULT '' NOT NULL," 768 elog " name char(64) binary DEFAULT '' NOT NULL,"
813 elog " dl char(128) DEFAULT '' NOT NULL," 769 elog " dl char(128) DEFAULT '' NOT NULL,"
814 elog " PRIMARY KEY (name)" 770 elog " PRIMARY KEY (name)"
815 elog ") CHARACTER SET utf8 COLLATE utf8_bin;" 771 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
816 fi 772 fi
773
817 mysql_check_version_range "4.0 to 5.0.99.99" \ 774 mysql_check_version_range "4.0 to 5.0.99.99" \
818 && use berkdb \ 775 && use berkdb \
819 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 776 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
820} 777}
821 778
822mysql_pkg_config() { 779mysql_pkg_config() {
823 # Make sure the vars are correctly initialized 780 # Make sure the vars are correctly initialized
824 mysql_init_vars 781 mysql_init_vars
825 782
826 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 783 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
827 784
828 if built_with_use ${CATEGORY}/${PN} minimal ; then 785 if built_with_use ${CATEGORY}/${PN} minimal ; then
829 die "Minimal builds do NOT include the MySQL server" 786 die "Minimal builds do NOT include the MySQL server"
830 fi 787 fi
831 788
832 local pwd1="a" 789 local pwd1="a"
833 local pwd2="b" 790 local pwd2="b"
834 local maxtry=5 791 local maxtry=5
835 792
836 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 793 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
837 ewarn "You have already a MySQL database in place." 794 ewarn "You have already a MySQL database in place."
838 ewarn "(${ROOT}/${DATADIR}/*)" 795 ewarn "(${ROOT}/${MY_DATADIR}/*)"
839 ewarn "Please rename or delete it if you wish to replace it." 796 ewarn "Please rename or delete it if you wish to replace it."
840 die "MySQL database already exists!" 797 die "MySQL database already exists!"
841 fi 798 fi
842 799
843 einfo "Creating the mysql database and setting proper" 800 einfo "Creating the mysql database and setting proper"
864 help_tables="${TMPDIR}/fill_help_tables.sql" 821 help_tables="${TMPDIR}/fill_help_tables.sql"
865 822
866 pushd "${TMPDIR}" &>/dev/null 823 pushd "${TMPDIR}" &>/dev/null
867 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 824 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR"
868 popd &>/dev/null 825 popd &>/dev/null
869 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 826 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
870 || die "MySQL databases not installed" 827 || die "MySQL databases not installed"
871 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 828 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
872 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 829 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
873 830
874 if mysql_version_is_at_least "4.1.3" ; then 831 if mysql_version_is_at_least "4.1.3" ; then
875 options="--skip-ndbcluster" 832 options="--skip-ndbcluster"
876 833
877 # Filling timezones, see 834 # Filling timezones, see
888 local mysqld="${ROOT}/usr/sbin/mysqld \ 845 local mysqld="${ROOT}/usr/sbin/mysqld \
889 ${options} \ 846 ${options} \
890 --user=mysql \ 847 --user=mysql \
891 --skip-grant-tables \ 848 --skip-grant-tables \
892 --basedir=${ROOT}/usr \ 849 --basedir=${ROOT}/usr \
893 --datadir=${ROOT}/${DATADIR} \ 850 --datadir=${ROOT}/${MY_DATADIR} \
894 --skip-innodb \ 851 --skip-innodb \
895 --skip-bdb \ 852 --skip-bdb \
896 --skip-networking \ 853 --skip-networking \
897 --max_allowed_packet=8M \ 854 --max_allowed_packet=8M \
898 --net_buffer_length=16K \ 855 --net_buffer_length=16K \
928 wait %1 885 wait %1
929 einfo "Done" 886 einfo "Done"
930} 887}
931 888
932mysql_pkg_postrm() { 889mysql_pkg_postrm() {
933 if [[ ${PN} == "mysql-slotted" ]] ; then
934 mysql_lib_symlinks 890 : # mysql_lib_symlinks "${D}"
935 mysql_clients_link_to_best_version
936 fi
937} 891}

Legend:
Removed from v.1.68  
changed lines
  Added in v.1.84

  ViewVC Help
Powered by ViewVC 1.1.20