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

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

  ViewVC Help
Powered by ViewVC 1.1.20