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

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

  ViewVC Help
Powered by ViewVC 1.1.20