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

Diff of /eclass/mysql.eclass

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

Revision 1.38 Revision 1.52
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 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.38 2006/10/20 13:14:21 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.52 2006/12/29 20:49:14 vivo Exp $
4 4
5# Author: Francesco Riosa <vivo@gentoo.org> 5# Author: Francesco Riosa <vivo@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 6# Maintainer: Luca Longinotti <chtekk@gentoo.org>
7 7
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too 8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too
… …
23 done 23 done
24 # strip leading "0" (otherwise it's considered an octal number by BASH) 24 # strip leading "0" (otherwise it's considered an octal number by BASH)
25 MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 25 MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
26fi 26fi
27 27
28DEPEND="${DEPEND} 28inherit eutils flag-o-matic gnuconfig autotools mysql_fx
29
30# Be warned, *DEPEND are version-dependant
31DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
32 userland_GNU? ( sys-process/procps )
33 >=sys-apps/sed-4
34 >=sys-apps/texinfo-4.7-r1
29 >=sys-libs/readline-4.1 35 >=sys-libs/readline-4.1
30 berkdb? ( sys-apps/ed )
31 ssl? ( >=dev-libs/openssl-0.9.6d )
32 userland_GNU? ( sys-process/procps )
33 >=sys-libs/zlib-1.2.3 36 >=sys-libs/zlib-1.2.3"
34 >=sys-apps/texinfo-4.7-r1 37
35 >=sys-apps/sed-4" 38# LEAVE THE SURROUNDING SPACES THERE
39MYSQL_MUTUALLY_EXCLUSIVE=" !dev-db/mysql !dev-db/mysql-community "
40DEPEND="${DEPEND} ${MYSQL_MUTUALLY_EXCLUSIVE/ !${CATEGORY}\/${PN} /}"
41
42mysql_version_is_at_least "5.01.00.00" \
43|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
36 44
37RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" 45RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
38 46
39# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 47# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
40PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 48PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
41 49
42inherit eutils flag-o-matic gnuconfig autotools mysql_fx
43
44# Shorten the path because the socket path length must be shorter than 107 chars 50# Shorten the path because the socket path length must be shorter than 107 chars
45# and we will run a mysql server during test phase 51# and we will run a mysql server during test phase
46S="${WORKDIR}/${PN}" 52S="${WORKDIR}/mysql" # BitKeeper ebuilds
47 53
48# Define $MY_FIXED_PV for MySQL patchsets 54# Define $MY_FIXED_PV for MySQL patchsets
49MY_FIXED_PV="${PV/_alpha/}" 55MY_FIXED_PV="${PV/_alpha/}"
50#MY_FIXED_PV="${MY_FIXED_PV/_beta/}" 56#MY_FIXED_PV="${MY_FIXED_PV/_beta/}"
51#MY_FIXED_PV="${MY_FIXED_PV/_rc/}" 57#MY_FIXED_PV="${MY_FIXED_PV/_rc/}"
52 58
59MY_P="${P/_/-}"
60MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds
61MY_P="${MY_P/-community/}"
62
53# Define correct SRC_URIs 63# Define correct SRC_URIs
54SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${P/_/-}${MYSQL_RERELEASE}.tar.gz" 64SRC_URI="${BASE_URI}/${MY_P}${MYSQL_RERELEASE}.tar.gz"
55if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then 65if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then
56 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2" 66 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2"
57 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball 67 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball
58 SRC_URI="${SRC_URI} http://gentoo.longitekk.com/${MYSQL_PATCHSET_FILENAME}" 68 SRC_URI="${SRC_URI} http://g3nt8.org/patches/${MYSQL_PATCHSET_FILENAME}"
59fi 69fi
60 70
61DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 71DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
62HOMEPAGE="http://www.mysql.com/" 72HOMEPAGE="http://www.mysql.com/"
63SLOT="0" 73SLOT="0"
64LICENSE="GPL-2" 74LICENSE="GPL-2"
65IUSE="big-tables berkdb debug embedded minimal perl selinux srvdir ssl static" 75IUSE="big-tables debug embedded minimal perl selinux srvdir ssl static"
66RESTRICT="confcache" 76RESTRICT="confcache"
67 77
68mysql_version_is_at_least "4.01.00.00" \ 78mysql_version_is_at_least "4.01.00.00" \
69&& IUSE="${IUSE} latin1" 79&& IUSE="${IUSE} latin1"
70 80
… …
77mysql_version_is_at_least "5.00.18.00" \ 87mysql_version_is_at_least "5.00.18.00" \
78&& IUSE="${IUSE} max-idx-128" 88&& IUSE="${IUSE} max-idx-128"
79 89
80mysql_version_is_at_least "5.01.00.00" \ 90mysql_version_is_at_least "5.01.00.00" \
81&& IUSE="${IUSE} innodb" 91&& IUSE="${IUSE} innodb"
92
93mysql_version_is_at_least "5.01.00.00" \
94|| IUSE="${IUSE} berkdb"
82 95
83EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 96EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
84 pkg_postinst pkg_config pkg_postrm 97 pkg_postinst pkg_config pkg_postrm
85 98
86# 99#
87# HELPER FUNCTIONS: 100# HELPER FUNCTIONS:
88# 101#
102
103bitkeeper_fetch() {
104
105 local tpv=( ${PV//[-._]/ } )
106 local reposuf="${tpv[0]}.${tpv[1]}"
107 useq "cluster" && reposuf="${reposuf}-ndb"
108 local repo_uri="bk://mysql.bkbits.net/mysql-${reposuf}"
109 ## -- ebk_store_dir: bitkeeper sources store directory
110 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
111 ## -- ebk_fetch_cmd: bitkeeper fetch command
112 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
113 # hint: does not work
114 local ebk_fetch_cmd="sfioball"
115 ## -- ebk_update_cmd: bitkeeper update command
116 local ebk_update_cmd="update"
117
118 #addread "/etc/bitkeeper"
119 addwrite "${ebk_store_dir}"
120
121 if [[ ! -d "${ebk_store_dir}" ]]; then
122 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
123 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
124 fi
125
126 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
127
128 local wc_path=mysql-${reposuf}
129
130 if [[ ! -d "${wc_path}" ]]; then
131 local options="-r+"
132 # first check out
133 einfo "bitkeeper check out start -->"
134 einfo " repository: ${repo_uri}"
135 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
136 || die "${EBK}: can't fetch from ${repo_uri}."
137 else
138 if [[ ! -d "${wc_path}/BK" ]]; then
139 popd
140 die "Look like ${wc_path} is not a bitkeeper path."
141 fi
142
143 # update working copy
144 einfo "bitkeeper update start -->"
145 einfo " repository: ${repo_uri}"
146
147 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
148 || die "BK: can't update from ${repo_uri} to ${wc_path}."
149
150 fi
151
152 einfo " working copy: ${wc_path}"
153 cd "${wc_path}"
154 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
155
156 echo
157 popd
158
159}
160
161mysql_disable_test() {
162 local testname="${1}" ; shift
163 local reason="${@}"
164 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
165 echo ${testname} : ${reason} >> "${mysql_disable_file}"
166 ewarn "test \"${testname}\" disabled because: \"${reason}\""
167}
89 168
90# void mysql_init_vars() 169# void mysql_init_vars()
91# 170#
92# Initialize global variables 171# Initialize global variables
93# 2005-11-19 <vivo@gentoo.org> 172# 2005-11-19 <vivo@gentoo.org>
… …
121 else 200 else
122 DATADIR="${MY_LOCALSTATEDIR}" 201 DATADIR="${MY_LOCALSTATEDIR}"
123 fi 202 fi
124 einfo "Using default DATADIR" 203 einfo "Using default DATADIR"
125 fi 204 fi
126 einfo "MySQL DATADIR is ${DATADIR}" 205 elog "MySQL DATADIR is ${DATADIR}"
127 206
128 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 207 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
129 if [[ -e "${DATADIR}" ]] ; then 208 if [[ -e "${DATADIR}" ]] ; then
130 ewarn "Previous datadir found, it's YOUR job to change" 209 elog "Previous datadir found, it's YOUR job to change"
131 ewarn "ownership and take care of it" 210 elog "ownership and take care of it"
132 PREVIOUS_DATADIR="yes" 211 PREVIOUS_DATADIR="yes"
133 else 212 else
134 PREVIOUS_DATADIR="no" 213 PREVIOUS_DATADIR="no"
135 fi 214 fi
136 export PREVIOUS_DATADIR 215 export PREVIOUS_DATADIR
… …
142 export MY_INCLUDEDIR 221 export MY_INCLUDEDIR
143 export DATADIR 222 export DATADIR
144} 223}
145 224
146configure_minimal() { 225configure_minimal() {
147 # these are things we exclude from a minimal build 226 # These are things we exclude from a minimal build, please
148 # note that the server actually does get built and installed 227 # note that the server actually does get built and installed,
149 # but we then delete it before packaging. 228 # but we then delete it before packaging.
150 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 229 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication"
151 230
152 for i in ${minimal_exclude_list}; do 231 for i in ${minimal_exclude_list} ; do
153 myconf="${myconf} --without-${i}" 232 myconf="${myconf} --without-${i}"
154 done 233 done
155 myconf="${myconf} --with-extra-charsets=none" 234 myconf="${myconf} --with-extra-charsets=none"
235 myconf="${myconf} --enable-local-infile"
236
237 if useq "static" ; then
238 myconf="${myconf} --with-client-ldflags=-all-static"
239 myconf="${myconf} --disable-shared"
240 else
241 myconf="${myconf} --enable-shared --enable-static"
242 fi
243
244 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then
245 myconf="${myconf} --with-charset=utf8"
246 myconf="${myconf} --with-collation=utf8_general_ci"
247 else
248 myconf="${myconf} --with-charset=latin1"
249 myconf="${myconf} --with-collation=latin1_swedish_ci"
250 fi
156} 251}
157 252
158configure_common() { 253configure_common() {
254 myconf="${myconf} $(use_with big-tables)"
159 myconf="${myconf} --enable-local-infile" 255 myconf="${myconf} --enable-local-infile"
160 myconf="${myconf} --with-extra-charsets=all" 256 myconf="${myconf} --with-extra-charsets=all"
161 myconf="${myconf} --with-mysqld-user=mysql" 257 myconf="${myconf} --with-mysqld-user=mysql"
258 myconf="${myconf} --with-server"
162 myconf="${myconf} --with-unix-socket-path='/var/run/mysqld/mysqld.sock'" 259 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
163 myconf="${myconf} --without-libwrap" 260 myconf="${myconf} --without-libwrap"
164 261
165 if useq "static" ; then 262 if useq "static" ; then
166 myconf="${myconf} --with-mysqld-ldflags=-all-static" 263 myconf="${myconf} --with-mysqld-ldflags=-all-static"
167 myconf="${myconf} --with-client-ldflags=-all-static" 264 myconf="${myconf} --with-client-ldflags=-all-static"
168 myconf="${myconf} --disable-shared" 265 myconf="${myconf} --disable-shared"
169 else 266 else
… …
172 269
173 if useq "debug" ; then 270 if useq "debug" ; then
174 myconf="${myconf} --with-debug=full" 271 myconf="${myconf} --with-debug=full"
175 else 272 else
176 myconf="${myconf} --without-debug" 273 myconf="${myconf} --without-debug"
177 mysql_version_is_at_least "4.01.03.00" \ 274 mysql_version_is_at_least "4.1.3" \
178 && useq "cluster" \ 275 && useq "cluster" \
179 && myconf="${myconf} --without-ndb-debug" 276 && myconf="${myconf} --without-ndb-debug"
180 fi 277 fi
181 278
182 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 279 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then
183 myconf="${myconf} --with-charset=utf8" 280 myconf="${myconf} --with-charset=utf8"
184 myconf="${myconf} --with-collation=utf8_general_ci" 281 myconf="${myconf} --with-collation=utf8_general_ci"
185 else 282 else
186 myconf="${myconf} --with-charset=latin1" 283 myconf="${myconf} --with-charset=latin1"
187 myconf="${myconf} --with-collation=latin1_swedish_ci" 284 myconf="${myconf} --with-collation=latin1_swedish_ci"
188 fi 285 fi
189 286
190 if useq "embedded" ; then 287 if useq "embedded" ; then
191 myconf="${myconf} --with-embedded-privilege-control" 288 myconf="${myconf} --with-embedded-privilege-control"
192 myconf="${myconf} --with-embedded-server" 289 myconf="${myconf} --with-embedded-server"
193 else 290 else
194 myconf="${myconf} --without-embedded-privilege-control" 291 myconf="${myconf} --without-embedded-privilege-control"
… …
201 myconf="${myconf} $(use_with perl bench)" 298 myconf="${myconf} $(use_with perl bench)"
202 myconf="${myconf} --enable-assembler" 299 myconf="${myconf} --enable-assembler"
203 myconf="${myconf} --with-extra-tools" 300 myconf="${myconf} --with-extra-tools"
204 myconf="${myconf} --with-innodb" 301 myconf="${myconf} --with-innodb"
205 myconf="${myconf} --without-readline" 302 myconf="${myconf} --without-readline"
206 mysql_version_is_at_least "5.00.00.00" || myconf="${myconf} $(use_with raid)" 303 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
207 304
208 if useq "ssl" ; then 305 if useq "ssl" ; then
209 # --with-vio is not needed anymore, it's on by default and 306 # --with-vio is not needed anymore, it's on by default and
210 # has been removed from configure 307 # has been removed from configure
211 mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio" 308 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
212 if mysql_version_is_at_least "5.00.06.00" ; then 309 if mysql_version_is_at_least "5.0.6" ; then
213 # myconf="${myconf} --with-yassl" 310 # myconf="${myconf} --with-yassl"
214 myconf="${myconf} --with-openssl" 311 myconf="${myconf} --with-openssl"
215 else 312 else
216 myconf="${myconf} --with-openssl" 313 myconf="${myconf} --with-openssl"
217 fi 314 fi
… …
221 318
222 # The following fix is due to a bug with bdb on SPARC's. See: 319 # The following fix is due to a bug with bdb on SPARC's. See:
223 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 320 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
224 # It comes down to non-64-bit safety problems. 321 # It comes down to non-64-bit safety problems.
225 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then 322 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
226 ewarn "bdb berkeley-db disabled due to incompatible arch" 323 elog "Berkeley DB support was disabled due to incompatible arch"
227 myconf="${myconf} --without-berkeley-db" 324 myconf="${myconf} --without-berkeley-db"
228 else 325 else
326 if useq "berkdb" ; then
229 useq "berkdb" && myconf="${myconf} --with-berkeley-db=./bdb" 327 myconf="${myconf} --with-berkeley-db=./bdb"
328 else
329 myconf="${myconf} --without-berkeley-db"
230 fi 330 fi
331 fi
231 332
232 if mysql_version_is_at_least "4.01.03.00" ; then 333 if mysql_version_is_at_least "4.1.3" ; then
233 myconf="${myconf} --with-geometry" 334 myconf="${myconf} --with-geometry"
234 myconf="${myconf} $(use_with cluster ndbcluster)" 335 myconf="${myconf} $(use_with cluster ndbcluster)"
235 fi 336 fi
236 337
237 mysql_version_is_at_least "4.01.11.00" \
238 && myconf="${myconf} $(use_with big-tables)"
239
240 if mysql_version_is_at_least "4.01.03.00" && useq "extraengine" ; then 338 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then
241 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 339 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
242 myconf="${myconf} --with-archive-storage-engine" 340 myconf="${myconf} --with-archive-storage-engine"
243 341
244 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 342 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
245 myconf="${myconf} --with-csv-storage-engine" 343 myconf="${myconf} --with-csv-storage-engine"
… …
248 myconf="${myconf} --with-blackhole-storage-engine" 346 myconf="${myconf} --with-blackhole-storage-engine"
249 347
250 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html 348 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
251 # http://dev.mysql.com/doc/mysql/en/federated-description.html 349 # http://dev.mysql.com/doc/mysql/en/federated-description.html
252 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 350 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
253 if mysql_version_is_at_least "5.00.03.00" ; then 351 if mysql_version_is_at_least "5.0.3" ; then
254 einfo "Before using the Federated storage engine, please be sure to read" 352 elog "Before using the Federated storage engine, please be sure to read"
255 einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 353 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
256 myconf="${myconf} --with-federated-storage-engine" 354 myconf="${myconf} --with-federated-storage-engine"
257 fi 355 fi
258 fi 356 fi
259 357
260 mysql_version_is_at_least "5.00.18.00" \ 358 mysql_version_is_at_least "5.0.18" \
261 && useq "max-idx-128" \ 359 && useq "max-idx-128" \
262 && myconf="${myconf} --with-max-indexes=128" 360 && myconf="${myconf} --with-max-indexes=128"
263} 361}
264 362
265configure_51() { 363configure_51() {
266 # TODO : !!!!! readd --withouth-readline 364 # TODO: !!!! readd --without-readline
267 # the failure depend upon config/ac-macros/readline.m4 checking into 365 # the failure depend upon config/ac-macros/readline.m4 checking into
268 # readline.h instead of history.h 366 # readline.h instead of history.h
269 myconf="${myconf} $(use_with big-tables)"
270 myconf="${myconf} $(use_with ssl)" 367 myconf="${myconf} $(use_with ssl)"
271 myconf="${myconf} --enable-assembler" 368 myconf="${myconf} --enable-assembler"
272 myconf="${myconf} --with-geometry" 369 myconf="${myconf} --with-geometry"
273 myconf="${myconf} --with-readline" 370 myconf="${myconf} --with-readline"
274 myconf="${myconf} --with-row-based-replication" 371 myconf="${myconf} --with-row-based-replication"
275 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 372 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
276 myconf="${myconf} --without-pstack" 373 myconf="${myconf} --without-pstack"
277 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 374 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128"
278 375
279 # 5.1 introduces a new way to manage storage engines (plugins) 376 # 5.1 introduces a new way to manage storage engines (plugins)
280 # like configuration=none 377 # like configuration=none
281 local plugins="csv,myisam,myisammrg,heap" 378 local plugins="csv,myisam,myisammrg,heap"
282 if useq "extraengine" ; then 379 if useq "extraengine" ; then
283 # like configuration=max-no-ndb, archive and example removed in 5.1.11 380 # like configuration=max-no-ndb, archive and example removed in 5.1.11
284 plugins="${plugins},blackhole,federated,ftexample,partition" 381 plugins="${plugins},archive,blackhole,example,federated,partition"
285 382
286 einfo "before to use federated engine be sure to read" 383 elog "Before using the Federated storage engine, please be sure to read"
287 einfo "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 384 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
288 fi 385 fi
289 386
290 if useq "innodb" ; then 387 if useq "innodb" ; then
291 plugins="${plugins},innobase" 388 plugins="${plugins},innobase"
292 fi 389 fi
… …
298 fi 395 fi
299 396
300 myconf="${myconf} --with-plugins=${plugins}" 397 myconf="${myconf} --with-plugins=${plugins}"
301} 398}
302 399
400pbxt_src_compile() {
401 mysql_init_vars
402
403 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
404
405 einfo "Reconfiguring dir '${PWD}'"
406 AT_GNUCONF_UPDATE="yes" eautoreconf
407
408 local myconf
409 myconf="${myconf} --with-mysql=${S}"
410 mkdir -p ${T}/lib
411 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}"
412 useq "debug" && myconf="${myconf} --with-debug=full"
413 # TODO is safe/needed to use econf here ?
414 ./configure ${myconf} || die "problem configuring pbxt storage engine"
415 # TODO is safe/needed to use emake here ?
416 make || die "problem making pbxt storage engine (${myconf})"
417
418 popd
419 # TODO: modify test suite
420}
421
422pbxt_src_install() {
423 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
424 make install || die "failed pbxt install"
425 popd
426}
427
303# 428#
304# EBUILD FUNCTIONS 429# EBUILD FUNCTIONS
305# 430#
306 431
307mysql_pkg_setup() { 432mysql_pkg_setup() {
308 enewgroup mysql 60 || die "problem adding 'mysql' group" 433 enewgroup mysql 60 || die "problem adding 'mysql' group"
309 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 434 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
310 435
311 if mysql_version_is_at_least "5.01.12.00" && useq "innodb" ; then
312 die "innodb now use cmake to build this is a TODO item"
313 fi
314
315 # Check for USE flag problems in pkg_setup 436 # Check for USE flag problems in pkg_setup
316 if useq "static" && useq "ssl" ; then 437 if useq "static" && useq "ssl" ; then
317 eerror "MySQL does not support being built statically with SSL support enabled!" 438 eerror "MySQL does not support being built statically with SSL support enabled!"
318 die "MySQL does not support being built statically with SSL support enabled!" 439 die "MySQL does not support being built statically with SSL support enabled!"
319 fi 440 fi
320 441
321 if ! mysql_version_is_at_least "5.00.00.00" \ 442 if ! mysql_version_is_at_least "5.0" \
322 && useq "raid" \ 443 && useq "raid" \
323 && useq "static" ; then 444 && useq "static" ; then
324 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 445 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
325 eerror "with RAID support enabled." 446 eerror "with RAID support enabled."
326 die "USE flags 'raid' and 'static' conflict!" 447 die "USE flags 'raid' and 'static' conflict!"
327 fi 448 fi
328 449
329 if mysql_version_is_at_least "4.01.03.00" \ 450 if mysql_version_is_at_least "4.1.3" \
330 && ( useq "cluster" || useq "extraengine" ) \ 451 && ( useq "cluster" || useq "extraengine" ) \
331 && useq "minimal" ; then 452 && useq "minimal" ; then
332 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 453 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
333 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 454 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
334 fi 455 fi
335 456
457 mysql_check_version_range "4.0 to 5.0.99.99" \
458 && useq "berkdb" \
336 useq "berkdb" && ewarn "Berkley DB support is deprecated and will be removed in future versions" 459 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
337} 460}
338 461
339mysql_src_unpack() { 462mysql_src_unpack() {
340 # Initialize the proper variables first 463 # Initialize the proper variables first
341 mysql_init_vars 464 mysql_init_vars
342 465
343 unpack ${A} 466 unpack ${A}
344 467
345 mv -f "${WORKDIR}/${P/_/-}${MYSQL_RERELEASE}" "${S}" 468 mv -f "${WORKDIR}/${MY_P}${MYSQL_RERELEASE}" "${S}"
346 cd "${S}" 469 cd "${S}"
347 470
348 # Apply the patches for this MySQL version 471 # Apply the patches for this MySQL version
349 if [[ -d "${WORKDIR}/${MY_FIXED_PV}" ]] ; then 472 if [[ -d "${WORKDIR}/${MY_FIXED_PV}" ]] ; then
350 EPATCH_SOURCE="${WORKDIR}/${MY_FIXED_PV}" EPATCH_SUFFIX="patch" epatch 473 EPATCH_SOURCE="${WORKDIR}/${MY_FIXED_PV}" EPATCH_SUFFIX="patch" epatch
… …
359 find . -name 'Makefile.am' \ 482 find . -name 'Makefile.am' \
360 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 483 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
361 484
362 # Manage mysqlmanager 485 # Manage mysqlmanager
363 mysql_version_is_at_least "5.00.15.00" \ 486 mysql_version_is_at_least "5.00.15.00" \
364 && sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \ 487 && sed -i -e "s!@GENTOO_EXT@!!g" \
365 -e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \ 488 -e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
366 "${S}/server-tools/instance-manager/Makefile.am" 489 "${S}/server-tools/instance-manager/Makefile.am"
367 490
368 if mysql_version_is_at_least "4.01.00.00" ; then 491 if mysql_version_is_at_least "4.01.00.00" ; then
369 # Remove what needs to be recreated, so we're sure it's actually done 492 # Remove what needs to be recreated, so we're sure it's actually done
… …
373 -exec rm -f {} \; 496 -exec rm -f {} \;
374 rm -f "ltmain.sh" 497 rm -f "ltmain.sh"
375 rm -f "scripts/mysqlbug" 498 rm -f "scripts/mysqlbug"
376 fi 499 fi
377 500
378 local rebuilddirlist bdbdir d 501 local rebuilddirlist d
379 502
380 if mysql_version_is_at_least "5.01.00.00" ; then 503 if mysql_version_is_at_least "5.1.12" ; then
381 rebuilddirlist=". storage/innobase" 504 rebuilddirlist="."
382 bdbdir='storage/bdb/dist' 505 # TODO IMPO! Check this with a cmake expert
506 useq "innodb" \
507 && cmake \
508 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \
509 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \
510 "storage/innobase"
383 else 511 else
384 rebuilddirlist=". innobase" 512 rebuilddirlist=". innobase"
385 bdbdir='bdb/dist'
386 fi 513 fi
387 514
388 for d in ${rebuilddirlist} ; do 515 for d in ${rebuilddirlist} ; do
389 einfo "Reconfiguring dir '${d}'" 516 einfo "Reconfiguring dir '${d}'"
390 pushd "${d}" &>/dev/null 517 pushd "${d}" &>/dev/null
391 AT_GNUCONF_UPDATE="yes" eautoreconf 518 AT_GNUCONF_UPDATE="yes" eautoreconf
392 popd &>/dev/null 519 popd &>/dev/null
393 done 520 done
394 521
395 # TODO: berkdb in MySQL 5.1 needs to be worked on
396 if useq "berkdb" \
397 && ! mysql_check_version_range "4.00.00.00 to 4.00.99.99" \ 522 if mysql_check_version_range "4.1 to 5.0.99.99" \
398 && ! mysql_check_version_range "5.01.00.00 to 5.01.08.99" ; then 523 && useq "berkdb" ; then
399 [[ -w "${bdbdir}/ltmain.sh" ]] && cp -f "ltmain.sh" "${bdbdir}/ltmain.sh" 524 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
400 pushd "${bdbdir}" \ 525 pushd "bdb/dist" \
401 && sh s_all \ 526 && sh s_all \
402 || die "Failed bdb reconfigure" \ 527 || die "Failed bdb reconfigure" \
403 &>/dev/null 528 &>/dev/null
404 popd &>/dev/null 529 popd &>/dev/null
405 fi 530 fi
… …
407 532
408mysql_src_compile() { 533mysql_src_compile() {
409 # Make sure the vars are correctly initialized 534 # Make sure the vars are correctly initialized
410 mysql_init_vars 535 mysql_init_vars
411 536
537 # $myconf is modified by the configure_* functions
412 local myconf 538 local myconf=""
413 539
414 if useq "static" ; then
415 myconf="${myconf} --with-mysqld-ldflags=-all-static"
416 myconf="${myconf} --with-client-ldflags=-all-static"
417 myconf="${myconf} --disable-shared"
418 else
419 myconf="${myconf} --enable-shared --enable-static"
420 fi
421
422 myconf="${myconf} --without-libwrap"
423
424 if useq "ssl" ; then 540 if useq "minimal" ; then
425 # --with-vio is not needed anymore, it's on by default and 541 configure_minimal
426 # has been removed from configure 542 else
427 mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio" 543 configure_common
428 if mysql_version_is_at_least "5.00.06.00" ; then 544 if mysql_version_is_at_least "5.1.10" ; then
429 # yassl-0.96 is still young and breaks with GCC-4.X or amd64 545 configure_51
430 # myconf="${myconf} --with-yassl"
431 myconf="${myconf} --with-openssl"
432 else 546 else
433 myconf="${myconf} --with-openssl" 547 configure_40_41_50
434 fi
435 else
436 myconf="${myconf} --without-openssl"
437 fi
438
439 if useq "debug" ; then
440 myconf="${myconf} --with-debug=full"
441 else
442 myconf="${myconf} --without-debug"
443
444 mysql_version_is_at_least "4.01.03.00" && useq "cluster" \
445 && myconf="${myconf} --without-ndb-debug"
446 fi
447
448 # These are things we exclude from a minimal build.
449 # Note that the server actually does get built and installed,
450 # but we then delete it.
451 local minimal_exclude_list="server embedded-server extra-tools innodb bench"
452
453 if ! useq "minimal" ; then
454 myconf="${myconf} --with-server"
455 myconf="${myconf} --with-extra-tools"
456
457 if ! mysql_version_is_at_least "5.00.00.00" ; then
458 if useq "raid" ; then
459 myconf="${myconf} --with-raid"
460 else
461 myconf="${myconf} --without-raid"
462 fi 548 fi
463 fi
464
465 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then
466 myconf="${myconf} --with-charset=utf8"
467 myconf="${myconf} --with-collation=utf8_general_ci"
468 else
469 myconf="${myconf} --with-charset=latin1"
470 myconf="${myconf} --with-collation=latin1_swedish_ci"
471 fi
472
473 # Optional again with MySQL 5.1
474 if mysql_version_is_at_least "5.01.00.00" ; then
475 if useq "innodb" ; then
476 myconf="${myconf} --with-innodb"
477 else
478 myconf="${myconf} --without-innodb"
479 fi
480 fi
481
482 # Lots of charsets
483 myconf="${myconf} --with-extra-charsets=all"
484
485 # The following fix is due to a bug with bdb on SPARC's. See:
486 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
487 # It comes down to non-64-bit safety problems.
488 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
489 ewarn "bdb berkeley-db disabled due to incompatible arch"
490 myconf="${myconf} --without-berkeley-db"
491 else
492 # TODO: berkdb in MySQL 5.1 needs to be worked on
493 if useq "berkdb" && ! mysql_check_version_range "5.01.00.00 to 5.01.08.99" ; then
494 myconf="${myconf} --with-berkeley-db=./bdb"
495 else
496 myconf="${myconf} --without-berkeley-db"
497 fi
498 fi
499
500 if mysql_version_is_at_least "4.01.03.00" ; then
501 myconf="${myconf} --with-geometry"
502
503 if useq "cluster" ; then
504 myconf="${myconf} --with-ndbcluster"
505 else
506 myconf="${myconf} --without-ndbcluster"
507 fi
508 fi
509
510 if useq "big-tables" ; then
511 myconf="${myconf} --with-big-tables"
512 else
513 myconf="${myconf} --without-big-tables"
514 fi
515
516 mysql_version_is_at_least "5.01.06.00" \
517 && myconf="${myconf} --with-ndb-binlog"
518
519 if useq "embedded" ; then
520 myconf="${myconf} --with-embedded-privilege-control"
521 myconf="${myconf} --with-embedded-server"
522 else
523 myconf="${myconf} --without-embedded-privilege-control"
524 myconf="${myconf} --without-embedded-server"
525 fi
526
527 # Benchmarking stuff needs Perl
528 if useq "perl" ; then
529 myconf="${myconf} --with-bench"
530 else
531 myconf="${myconf} --without-bench"
532 fi
533 else
534 for i in ${minimal_exclude_list} ; do
535 myconf="${myconf} --without-${i}"
536 done
537 myconf="${myconf} --without-berkeley-db"
538 myconf="${myconf} --with-extra-charsets=none"
539 fi
540
541 if mysql_version_is_at_least "4.01.03.00" && useq "extraengine" ; then
542 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
543 myconf="${myconf} --with-archive-storage-engine"
544
545 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
546 myconf="${myconf} --with-csv-storage-engine"
547
548 # http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
549 myconf="${myconf} --with-blackhole-storage-engine"
550
551 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
552 # http://dev.mysql.com/doc/mysql/en/federated-description.html
553 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
554 if mysql_version_is_at_least "5.00.03.00" ; then
555 einfo "Before using the Federated storage engine, please be sure to read"
556 einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
557 myconf="${myconf} --with-federated-storage-engine"
558 fi
559
560 # http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
561 if mysql_version_is_at_least "5.01.00.00" ; then
562 myconf="${myconf} --with-partition"
563 fi
564 fi
565
566 mysql_version_is_at_least "5.00.18.00" \
567 && useq "max-idx-128" \
568 && myconf="${myconf} --with-max-indexes=128"
569
570 mysql_version_is_at_least "5.01.05.00" \
571 && myconf="${myconf} --with-row-based-replication"
572
573 # TODO: Rechek again later, there were problems with assembler enabled
574 # and some combination of USE flags with MySQL 5.1
575 if mysql_check_version_range "5.01.00.00 to 5.01.08.99" ; then
576 myconf="${myconf} --disable-assembler"
577 else
578 myconf="${myconf} --enable-assembler"
579 fi 549 fi
580 550
581 # Bug #114895, bug #110149 551 # Bug #114895, bug #110149
582 filter-flags "-O" "-O[01]" 552 filter-flags "-O" "-O[01]"
583 553
584 # glib-2.3.2_pre fix, bug #16496 554 # glib-2.3.2_pre fix, bug #16496
585 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 555 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
586 556
587 append-flags "-fno-exceptions -fno-strict-aliasing" 557 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
588 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 558 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
589 mysql_version_is_at_least "5.00.00.00" \ 559 mysql_version_is_at_least "5.0" \
590 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 560 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
591 export CXXFLAGS="${CXXFLAGS}" 561 export CXXFLAGS
592 562
593 econf \ 563 econf \
594 --libexecdir="/usr/sbin" \ 564 --libexecdir="/usr/sbin" \
595 --sysconfdir="${MY_SYSCONFDIR}" \ 565 --sysconfdir="${MY_SYSCONFDIR}" \
596 --localstatedir="${MY_LOCALSTATEDIR}" \ 566 --localstatedir="${MY_LOCALSTATEDIR}" \
597 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 567 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
598 --libdir="${MY_LIBDIR}" \ 568 --libdir="${MY_LIBDIR}" \
599 --includedir="${MY_INCLUDEDIR}" \ 569 --includedir="${MY_INCLUDEDIR}" \
600 --with-low-memory \ 570 --with-low-memory \
601 --enable-local-infile \
602 --with-mysqld-user=mysql \
603 --with-client-ldflags=-lstdc++ \ 571 --with-client-ldflags=-lstdc++ \
604 --enable-thread-safe-client \ 572 --enable-thread-safe-client \
605 --with-comment="Gentoo Linux ${PF}" \ 573 --with-comment="Gentoo Linux ${PF}" \
606 --with-unix-socket-path="/var/run/mysqld/mysqld.sock" \
607 --without-readline \
608 --without-docs \ 574 --without-docs \
609 ${myconf} || die "bad ./configure" 575 ${myconf} || die "econf failed"
610 576
611 # TODO: Move this before autoreconf !!! 577 # TODO: Move this before autoreconf !!!
612 find . -type f -name Makefile -print0 \ 578 find . -type f -name Makefile -print0 \
613 | xargs -0 -n100 sed -i \ 579 | xargs -0 -n100 sed -i \
614 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 580 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
615 581
616 emake || die "compile problem" 582 emake || die "emake failed"
617} 583}
618 584
619mysql_src_install() { 585mysql_src_install() {
620 # Make sure the vars are correctly initialized 586 # Make sure the vars are correctly initialized
621 mysql_init_vars 587 mysql_init_vars
622 588
623 make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "make install error" 589 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
624 590
625 insinto "${MY_INCLUDEDIR}" 591 insinto "${MY_INCLUDEDIR}"
626 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h 592 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
627 593
628 # Convenience links 594 # Convenience links
… …
645 rm -f "${D}/usr/sbin/mysqld" 611 rm -f "${D}/usr/sbin/mysqld"
646 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 612 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
647 fi 613 fi
648 614
649 # Configuration stuff 615 # Configuration stuff
650 if mysql_version_is_at_least "4.01.00.00" ; then 616 if mysql_version_is_at_least "4.1" ; then
651 mysql_mycnf_version="4.1" 617 mysql_mycnf_version="4.1"
652 else 618 else
653 mysql_mycnf_version="4.0" 619 mysql_mycnf_version="4.0"
654 fi 620 fi
655 insinto "${MY_SYSCONFDIR}" 621 insinto "${MY_SYSCONFDIR}"
656 doins "scripts/mysqlaccess.conf" 622 doins "scripts/mysqlaccess.conf"
657 sed -e "s!@DATADIR@!${DATADIR}!g" \ 623 sed -e "s!@DATADIR@!${DATADIR}!g" \
658 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 624 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
659 > "${TMPDIR}/my.cnf.ok" 625 > "${TMPDIR}/my.cnf.ok"
660 if mysql_version_is_at_least "4.01.00.00" && useq "latin1" ; then 626 if mysql_version_is_at_least "4.1" && useq "latin1" ; then
661 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 627 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
662 fi 628 fi
663 newins "${TMPDIR}/my.cnf.ok" my.cnf 629 newins "${TMPDIR}/my.cnf.ok" my.cnf
664 630
665 insinto "/etc/conf.d" 631 insinto "/etc/conf.d"
… …
735 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 701 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
736 702
737 if ! useq "minimal" ; then 703 if ! useq "minimal" ; then
738 # Your friendly public service announcement ... 704 # Your friendly public service announcement ...
739 einfo 705 einfo
740 einfo "You might want to run:" 706 elog "You might want to run:"
741 einfo "\"emerge --config =${CATEGORY}/${PF}\"" 707 elog "\"emerge --config =${CATEGORY}/${PF}\""
742 einfo "if this is a new install." 708 elog "if this is a new install."
743 einfo 709 einfo
744 mysql_version_is_at_least "5.01.00.00" \ 710 mysql_version_is_at_least "5.01.00.00" \
745 || einfo "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream." 711 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream."
746 fi 712 fi
713 mysql_check_version_range "4.0 to 5.0.99.99" \
714 && useq "berkdb" \
747 useq "berkdb" && ewarn "Berkley DB support is deprecated and will be removed in future versions" 715 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
748} 716}
749 717
750mysql_pkg_config() { 718mysql_pkg_config() {
751 # Make sure the vars are correctly initialized 719 # Make sure the vars are correctly initialized
752 mysql_init_vars 720 mysql_init_vars
753 721
754 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 722 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR"
755 723
756 if built_with_use dev-db/mysql minimal ; then 724 if built_with_use ${CATEGORY}/${PN} minimal ; then
757 die "Minimal builds do NOT include the MySQL server" 725 die "Minimal builds do NOT include the MySQL server"
758 fi 726 fi
759 727
760 local pwd1="a" 728 local pwd1="a"
761 local pwd2="b" 729 local pwd2="b"
… …
797 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 765 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \
798 || die "MySQL databases not installed" 766 || die "MySQL databases not installed"
799 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 767 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null
800 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 768 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null
801 769
802 if mysql_version_is_at_least "4.01.03.00" ; then 770 if mysql_version_is_at_least "4.1.3" ; then
803 options="--skip-ndbcluster" 771 options="--skip-ndbcluster"
804 772
805 # Filling timezones, see 773 # Filling timezones, see
806 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 774 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
807 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 775 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
… …
856 wait %1 824 wait %1
857 einfo "Done" 825 einfo "Done"
858} 826}
859 827
860mysql_pkg_postrm() { 828mysql_pkg_postrm() {
861 mysql_lib_symlinks 829 : #mysql_lib_symlinks
862} 830}
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.52
  ViewVC Help
Powered by ViewVC 1.1.13