View | Details | Raw Unified | Return to bug 194435 | Differences between
and this patch

Collapse All | Expand All

(-)mariadb55-server/Makefile (-3 / +6 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $
1
# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $
2
2
3
PORTNAME?=	mariadb
3
PORTNAME?=	mariadb
4
PORTVERSION=	5.5.39
4
PORTVERSION=	5.5.40
5
CATEGORIES=	databases ipv6
5
CATEGORIES=	databases ipv6
6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
Lines 40-46 Link Here
40
		-DINSTALL_MANDIR="man" \
40
		-DINSTALL_MANDIR="man" \
41
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
41
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
42
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
42
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
43
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
43
		-DINSTALL_MYSQLTESTDIR= \
44
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
44
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
45
		-DINSTALL_SBINDIR="libexec" \
45
		-DINSTALL_SBINDIR="libexec" \
46
		-DINSTALL_SCRIPTDIR="bin" \
46
		-DINSTALL_SCRIPTDIR="bin" \
Lines 110-116 Link Here
110
USE_MYSQL=	yes
110
USE_MYSQL=	yes
111
WANT_MYSQL_VER=	55m
111
WANT_MYSQL_VER=	55m
112
112
113
CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-46-9][0-9]-server-* mariadb5.[0-46-9]-server-* percona[0-9][0-9]-server-*
113
CONFLICTS_INSTALL=	mysql*-server-* \
114
			mariadb1[0-9][0-9]-server-* \
115
			mariadb5[0-46-9]-server-* \
116
			percona*-server-*
114
117
115
USE_RC_SUBR=	mysql-server
118
USE_RC_SUBR=	mysql-server
116
119
(-)mariadb55-server/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mariadb-5.5.39.tar.gz) = cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14
1
SHA256 (mariadb-5.5.40.tar.gz) = cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a
2
SIZE (mariadb-5.5.39.tar.gz) = 45084762
2
SIZE (mariadb-5.5.40.tar.gz) = 44745240
(-)mariadb55-server/files/patch-cmake__jemalloc.cmake (-11 / +13 lines)
Lines 1-14 Link Here
1
--- cmake/jemalloc.cmake.orig	2013-09-20 00:34:22.000000000 +0200
1
--- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
2
+++ cmake/jemalloc.cmake	2013-09-27 22:46:05.791110010 +0200
2
+++ cmake/jemalloc.cmake	2014-11-16 20:27:50.032638191 +0100
3
@@ -37,9 +37,9 @@
3
@@ -22,11 +22,11 @@
4
     SET(WITH_JEMALLOC "no")
4
       SET(libname jemalloc)
5
   ENDIF()
5
     ENDIF()
6
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
6
 
7
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
7
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
8
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
8
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
9
     SET(CMAKE_REQUIRED_LIBRARIES)
10
 
9
     IF (HAVE_JEMALLOC)
11
     IF (HAVE_JEMALLOC)
10
-      SET(LIBJEMALLOC jemalloc)
12
-      SET(LIBJEMALLOC ${libname})
11
+      SET(LIBJEMALLOC c)
13
+      SET(LIBJEMALLOC c)
12
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
14
     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
13
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
15
       MESSAGE(FATAL_ERROR "${libname} is not found")
14
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")
16
     ENDIF()
(-)mariadb55-server/pkg-plist (-142 / +1 lines)
Lines 36-41 Link Here
36
lib/mysql/plugin/adt_null.so
36
lib/mysql/plugin/adt_null.so
37
lib/mysql/plugin/auth_0x0100.so
37
lib/mysql/plugin/auth_0x0100.so
38
lib/mysql/plugin/auth_pam.so
38
lib/mysql/plugin/auth_pam.so
39
lib/mysql/plugin/auth_socket.so
39
lib/mysql/plugin/auth_test_plugin.so
40
lib/mysql/plugin/auth_test_plugin.so
40
lib/mysql/plugin/daemon_example.ini
41
lib/mysql/plugin/daemon_example.ini
41
lib/mysql/plugin/dialog.so
42
lib/mysql/plugin/dialog.so
Lines 157-302 Link Here
157
%%DATADIR%%/slovak/errmsg.sys
158
%%DATADIR%%/slovak/errmsg.sys
158
%%DATADIR%%/spanish/errmsg.sys
159
%%DATADIR%%/spanish/errmsg.sys
159
%%DATADIR%%/swedish/errmsg.sys
160
%%DATADIR%%/swedish/errmsg.sys
160
%%DATADIR%%/tests/plugin/example/README
161
%%DATADIR%%/tests/plugin/example/mtr/suite.pm
162
%%DATADIR%%/tests/plugin/example/mtr/t/combs.combinations
163
%%DATADIR%%/tests/plugin/example/mtr/t/inc.inc
164
%%DATADIR%%/tests/plugin/example/mtr/t/newcomb.combinations
165
%%DATADIR%%/tests/plugin/example/mtr/t/over.result
166
%%DATADIR%%/tests/plugin/example/mtr/t/over.test
167
%%DATADIR%%/tests/plugin/example/mtr/t/self.result
168
%%DATADIR%%/tests/plugin/example/mtr/t/self.test
169
%%DATADIR%%/tests/plugin/example/mtr/t/source.result
170
%%DATADIR%%/tests/plugin/example/mtr/t/test2,c2.result
171
%%DATADIR%%/tests/plugin/example/mtr/t/test2.opt
172
%%DATADIR%%/tests/plugin/example/mtr/t/test2.rdiff
173
%%DATADIR%%/tests/plugin/example/mtr/t/testsh-master.sh
174
%%DATADIR%%/tests/plugin/heap/mtr2/README
175
%%DATADIR%%/tests/plugin/heap/mtr2/my.cnf
176
%%DATADIR%%/tests/plugin/innobase/storage_engine/alter_tablespace.opt
177
%%DATADIR%%/tests/plugin/innobase/storage_engine/autoinc_secondary.rdiff
178
%%DATADIR%%/tests/plugin/innobase/storage_engine/cache_index.rdiff
179
%%DATADIR%%/tests/plugin/innobase/storage_engine/checksum_table_live.rdiff
180
%%DATADIR%%/tests/plugin/innobase/storage_engine/define_engine.inc
181
%%DATADIR%%/tests/plugin/innobase/storage_engine/disabled.def
182
%%DATADIR%%/tests/plugin/innobase/storage_engine/fulltext_search.rdiff
183
%%DATADIR%%/tests/plugin/innobase/storage_engine/index_enable_disable.rdiff
184
%%DATADIR%%/tests/plugin/innobase/storage_engine/index_type_hash.rdiff
185
%%DATADIR%%/tests/plugin/innobase/storage_engine/insert_delayed.rdiff
186
%%DATADIR%%/tests/plugin/innobase/storage_engine/lock_concurrent.rdiff
187
%%DATADIR%%/tests/plugin/innobase/storage_engine/optimize_table.rdiff
188
%%DATADIR%%/tests/plugin/innobase/storage_engine/repair_table.rdiff
189
%%DATADIR%%/tests/plugin/innobase/storage_engine/suite.opt
190
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_data_index_dir.rdiff
191
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_insert_method.rdiff
192
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_key_block_size.opt
193
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_row_format.opt
194
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_row_format.rdiff
195
%%DATADIR%%/tests/plugin/innobase/storage_engine/tbl_opt_union.rdiff
196
%%DATADIR%%/tests/plugin/innobase/storage_engine/type_char_indexes.rdiff
197
%%DATADIR%%/tests/plugin/innobase/storage_engine/type_float_indexes.rdiff
198
%%DATADIR%%/tests/plugin/innobase/storage_engine/type_spatial_indexes.rdiff
199
%%DATADIR%%/tests/plugin/innobase/storage_engine/vcol.rdiff
200
%%DATADIR%%/tests/plugin/innobase/storage_engine/parts/checksum_table.rdiff
201
%%DATADIR%%/tests/plugin/innobase/storage_engine/parts/create_table.rdiff
202
%%DATADIR%%/tests/plugin/innobase/storage_engine/parts/optimize_table.rdiff
203
%%DATADIR%%/tests/plugin/innobase/storage_engine/parts/repair_table.rdiff
204
%%DATADIR%%/tests/plugin/innobase/storage_engine/parts/suite.opt
205
%%DATADIR%%/tests/plugin/innobase/storage_engine/trx/cons_snapshot_serializable.rdiff
206
%%DATADIR%%/tests/plugin/innobase/storage_engine/trx/level_read_committed.rdiff
207
%%DATADIR%%/tests/plugin/innobase/storage_engine/trx/level_read_uncommitted.rdiff
208
%%DATADIR%%/tests/plugin/innobase/storage_engine/trx/suite.opt
209
%%DATADIR%%/tests/plugin/myisam/mtr2/README
210
%%DATADIR%%/tests/plugin/myisam/mtr2/overlay.inc
211
%%DATADIR%%/tests/plugin/myisam/mtr2/single.rdiff
212
%%DATADIR%%/tests/plugin/myisam/mtr2/suite.opt
213
%%DATADIR%%/tests/plugin/myisam/mtr2/suite.pm
214
%%DATADIR%%/tests/plugin/myisam/storage_engine/alter_tablespace.rdiff
215
%%DATADIR%%/tests/plugin/myisam/storage_engine/check_table.rdiff
216
%%DATADIR%%/tests/plugin/myisam/storage_engine/define_engine.inc
217
%%DATADIR%%/tests/plugin/myisam/storage_engine/foreign_keys.rdiff
218
%%DATADIR%%/tests/plugin/myisam/storage_engine/index_type_hash.rdiff
219
%%DATADIR%%/tests/plugin/myisam/storage_engine/show_engine.rdiff
220
%%DATADIR%%/tests/plugin/myisam/storage_engine/tbl_opt_insert_method.rdiff
221
%%DATADIR%%/tests/plugin/myisam/storage_engine/tbl_opt_union.rdiff
222
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/cons_snapshot_repeatable_read.rdiff
223
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/cons_snapshot_serializable.rdiff
224
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/delete.rdiff
225
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/insert.rdiff
226
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/level_read_committed.rdiff
227
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/level_read_uncommitted.rdiff
228
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/level_repeatable_read.rdiff
229
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/level_serializable.rdiff
230
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/select_for_update.rdiff
231
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/select_lock_in_share_mode.rdiff
232
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/update.rdiff
233
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/xa.rdiff
234
%%DATADIR%%/tests/plugin/myisam/storage_engine/trx/xa_recovery.rdiff
235
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/alter_table.inc
236
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/alter_table.rdiff
237
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/alter_tablespace.rdiff
238
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/analyze_table.rdiff
239
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/autoincrement.rdiff
240
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/cache_index.rdiff
241
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/checksum_table_live.rdiff
242
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/cleanup_engine.inc
243
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/create_table.inc
244
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/create_table.rdiff
245
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/define_engine.inc
246
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/disabled.def
247
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/foreign_keys.rdiff
248
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/fulltext_search.rdiff
249
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/handler.rdiff
250
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/index.rdiff
251
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/index_enable_disable.rdiff
252
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/index_type_btree.rdiff
253
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/index_type_hash.rdiff
254
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/insert_delayed.rdiff
255
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/lock.rdiff
256
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/optimize_table.rdiff
257
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/repair_table.rdiff
258
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/show_engine.rdiff
259
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_ai.rdiff
260
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_avg_row_length.rdiff
261
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_checksum.rdiff
262
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_connection.rdiff
263
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_data_index_dir.rdiff
264
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_delay_key_write.rdiff
265
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_insert_method.rdiff
266
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_key_block_size.rdiff
267
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_max_rows.rdiff
268
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_min_rows.rdiff
269
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_pack_keys.rdiff
270
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_password.rdiff
271
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_row_format.rdiff
272
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_opt_union.rdiff
273
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_standard_opts.rdiff
274
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/tbl_temporary.rdiff
275
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/truncate_table.rdiff
276
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/type_char_indexes.rdiff
277
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/type_float_indexes.rdiff
278
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/type_spatial.rdiff
279
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/type_spatial_indexes.rdiff
280
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/vcol.rdiff
281
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/alter_table.rdiff
282
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/analyze_table.rdiff
283
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/check_table.rdiff
284
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/checksum_table.rdiff
285
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/create_table.rdiff
286
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/optimize_table.rdiff
287
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/repair_table.rdiff
288
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/parts/truncate_table.rdiff
289
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/cons_snapshot_repeatable_read.rdiff
290
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/cons_snapshot_serializable.rdiff
291
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/delete.rdiff
292
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/insert.rdiff
293
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/level_read_committed.rdiff
294
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/level_read_uncommitted.rdiff
295
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/level_repeatable_read.rdiff
296
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/level_serializable.rdiff
297
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/select_for_update.rdiff
298
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/select_lock_in_share_mode.rdiff
299
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/update.rdiff
300
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/xa.rdiff
301
%%DATADIR%%/tests/plugin/myisammrg/storage_engine/trx/xa_recovery.rdiff
302
%%DATADIR%%/ukrainian/errmsg.sys
161
%%DATADIR%%/ukrainian/errmsg.sys

Return to bug 194435