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

Diff of /eclass/mysql.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20