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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20