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

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

  ViewVC Help
Powered by ViewVC 1.1.20