cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to mariadb-10.0.26, from Brad (maintainer)

Browse Source
This commit is contained in:
sthen 2016-07-31 21:30:06 +00:00
parent 9a35d5456e
commit 357c4982ec
6 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/mariadb/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2016/05/12 14:00:12 espie Exp $
# $OpenBSD: Makefile,v 1.43 2016/07/31 21:30:06 sthen Exp $
# archs with atomic ops
ONLY_FOR_ARCHS-server= alpha amd64 i386 mips64 mips64el powerpc sparc64
@ -9,13 +9,12 @@ COMMENT-main= multithreaded SQL database (client)
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 10.0.25
VERSION= 10.0.26
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
EPOCH= 1
REVISION-server=0
CATEGORIES= databases
MASTER_SITES= http://mariadb.mirror.iweb.com//${DISTNAME}/source/ \

4
databases/mariadb/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mariadb-10.0.25.tar.gz) = RUCDLBgRKjMvYfTutXFAiQxOIYiuErMS9OLooDY1U+Q=
SIZE (mariadb-10.0.25.tar.gz) = 57459461
SHA256 (mariadb-10.0.26.tar.gz) = V4U42bUfRVy9DLAh9SMoSkVIC0u6hTtKefNJfEnsQMA=
SIZE (mariadb-10.0.26.tar.gz) = 57621647

14
databases/mariadb/patches/patch-storage_connect_reldef_cpp
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-storage_connect_reldef_cpp,v 1.5 2016/03/15 12:42:08 sthen Exp $
--- storage/connect/reldef.cpp.orig Wed Feb 17 15:59:55 2016
+++ storage/connect/reldef.cpp Sat Mar 5 22:19:34 2016
@@ -516,6 +516,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
$OpenBSD: patch-storage_connect_reldef_cpp,v 1.6 2016/07/31 21:30:06 sthen Exp $
--- storage/connect/reldef.cpp.orig Thu Jun 23 05:24:43 2016
+++ storage/connect/reldef.cpp Sun Jul 3 01:07:06 2016
@@ -515,6 +515,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
#else // !__WIN__
const char *error = NULL;
Dl_info dl_info;
+#ifndef RTLD_NOLOAD
+#define RTLD_NOLOAD 0
+#endif
+
#if 0 // Don't know what all this stuff does
// The OEM lib must retrieve exported CONNECT variables
if (dladdr(&connect_hton, &dl_info)) {
Dl_info dl_info;

17
databases/mariadb/patches/patch-storage_innobase_include_os0sync_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-storage_innobase_include_os0sync_h,v 1.4 2016/05/04 07:37:22 sthen Exp $
InnoDB attempted to verify if __sync_lock_test_and_set() is available by
checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with availability
of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS.
--- storage/innobase/include/os0sync.h.orig Mon May 2 06:19:43 2016
+++ storage/innobase/include/os0sync.h Mon May 2 06:20:19 2016
@@ -466,7 +466,7 @@ amount to decrement. */
# define os_atomic_decrement_uint64(ptr, amount) \
os_atomic_decrement(ptr, amount)
-# if defined(IB_STRONG_MEMORY_MODEL)
+# if defined(HAVE_ATOMIC_BUILTINS)
/** Do an atomic test and set.
@param[in,out] ptr Memory location to set to non-zero

4
databases/mariadb/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.14 2016/03/15 12:42:08 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2016/07/31 21:30:06 sthen Exp $
@conflict mysql-client-*
@conflict mysql-server-*
@pkgpath databases/mysql,-main
@ -71,6 +71,7 @@ include/mysql/private/atomic/rwlock.h
include/mysql/private/atomic/solaris.h
include/mysql/private/atomic/x86-gcc.h
include/mysql/private/base64.h
include/mysql/private/config.h
include/mysql/private/ft_global.h
include/mysql/private/hash.h
include/mysql/private/heap.h
@ -107,6 +108,7 @@ include/mysql/private/mysqld_default_groups.h
include/mysql/private/mysys_err.h
include/mysql/private/password.h
include/mysql/private/probes_mysql.h
include/mysql/private/probes_mysql_nodtrace.h
include/mysql/private/queues.h
include/mysql/private/rijndael.h
include/mysql/private/service_versions.h

26
databases/mariadb/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.22 2016/05/04 07:37:22 sthen Exp $
@comment $OpenBSD: PLIST-tests,v 1.23 2016/07/31 21:30:06 sthen Exp $
@conflict mysql-client-*
@pkgpath databases/mysql,-tests
@bin bin/mysql_client_test
@ -675,6 +675,7 @@ share/mysql-test/mysql-test-run.pl
share/mysql-test/plugin/
share/mysql-test/plugin/connect/
share/mysql-test/plugin/connect/connect/
share/mysql-test/plugin/connect/connect/disabled.def
share/mysql-test/plugin/connect/connect/my.cnf
share/mysql-test/plugin/connect/connect/r/
share/mysql-test/plugin/connect/connect/r/alter.result
@ -694,6 +695,10 @@ share/mysql-test/plugin/connect/connect/r/grant3.result
share/mysql-test/plugin/connect/connect/r/index.result
share/mysql-test/plugin/connect/connect/r/ini.result
share/mysql-test/plugin/connect/connect/r/ini_grant.result
share/mysql-test/plugin/connect/connect/r/jdbc.result
share/mysql-test/plugin/connect/connect/r/jdbc_new.result
share/mysql-test/plugin/connect/connect/r/jdbc_oracle.result
share/mysql-test/plugin/connect/connect/r/jdbc_postgresql.result
share/mysql-test/plugin/connect/connect/r/json.result
share/mysql-test/plugin/connect/connect/r/json_udf.result
share/mysql-test/plugin/connect/connect/r/json_udf_bin.result
@ -749,6 +754,7 @@ share/mysql-test/plugin/connect/connect/std_data/expense.json
share/mysql-test/plugin/connect/connect/std_data/expenses.txt
share/mysql-test/plugin/connect/connect/std_data/funny.txt
share/mysql-test/plugin/connect/connect/std_data/funny2.txt
share/mysql-test/plugin/connect/connect/std_data/girls.txt
share/mysql-test/plugin/connect/connect/std_data/gloss.json
share/mysql-test/plugin/connect/connect/std_data/latin1.xml
share/mysql-test/plugin/connect/connect/std_data/mulexp3.json
@ -786,6 +792,12 @@ share/mysql-test/plugin/connect/connect/t/have_odbc_sqlite3.inc
share/mysql-test/plugin/connect/connect/t/index.test
share/mysql-test/plugin/connect/connect/t/ini.test
share/mysql-test/plugin/connect/connect/t/ini_grant.test
share/mysql-test/plugin/connect/connect/t/jdbc.test
share/mysql-test/plugin/connect/connect/t/jdbc_new.test
share/mysql-test/plugin/connect/connect/t/jdbc_oracle.test
share/mysql-test/plugin/connect/connect/t/jdbc_postgresql.test
share/mysql-test/plugin/connect/connect/t/jdbconn.inc
share/mysql-test/plugin/connect/connect/t/jdbconn_cleanup.inc
share/mysql-test/plugin/connect/connect/t/json.test
share/mysql-test/plugin/connect/connect/t/json_udf.inc
share/mysql-test/plugin/connect/connect/t/json_udf.test
@ -1869,6 +1881,7 @@ share/mysql-test/r/information_schema_inno.result
share/mysql-test/r/information_schema_parameters.result
share/mysql-test/r/information_schema_part.result
share/mysql-test/r/information_schema_routines.result
share/mysql-test/r/information_schema_stats.result
share/mysql-test/r/init_connect.result
share/mysql-test/r/init_connection_query_cache.result
share/mysql-test/r/init_file.result
@ -2236,6 +2249,7 @@ share/mysql-test/r/ssl_7937,nossl.result
share/mysql-test/r/ssl_7937.result
share/mysql-test/r/ssl_8k_key.result
share/mysql-test/r/ssl_and_innodb.result
share/mysql-test/r/ssl_ca.result
share/mysql-test/r/ssl_cert_verify.result
share/mysql-test/r/ssl_cipher.result
share/mysql-test/r/ssl_compress.result
@ -4338,6 +4352,7 @@ share/mysql-test/suite/innodb/r/innodb-corrupted-table.result
share/mysql-test/suite/innodb/r/innodb-dict.result
share/mysql-test/suite/innodb/r/innodb-fk-warnings.result
share/mysql-test/suite/innodb/r/innodb-fk.result
share/mysql-test/suite/innodb/r/innodb-fkcheck.result
share/mysql-test/suite/innodb/r/innodb-get-fk.result
share/mysql-test/suite/innodb/r/innodb-index.result
share/mysql-test/suite/innodb/r/innodb-index_ucs2.result
@ -4515,6 +4530,7 @@ share/mysql-test/suite/innodb/t/innodb-corrupted-table.test
share/mysql-test/suite/innodb/t/innodb-dict.test
share/mysql-test/suite/innodb/t/innodb-fk-warnings.test
share/mysql-test/suite/innodb/t/innodb-fk.test
share/mysql-test/suite/innodb/t/innodb-fkcheck.test
share/mysql-test/suite/innodb/t/innodb-get-fk.test
share/mysql-test/suite/innodb/t/innodb-index.test
share/mysql-test/suite/innodb/t/innodb-index_ucs2.test
@ -6050,6 +6066,7 @@ share/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
share/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
share/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
share/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
share/mysql-test/suite/perfschema/r/table_name.result
share/mysql-test/suite/perfschema/r/table_schema.result
share/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
share/mysql-test/suite/perfschema/r/temp_table_io.result
@ -6471,6 +6488,7 @@ share/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
share/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
share/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
share/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
share/mysql-test/suite/perfschema/t/table_name.test
share/mysql-test/suite/perfschema/t/table_schema.test
share/mysql-test/suite/perfschema/t/tampered_perfschema_table1-master.opt
share/mysql-test/suite/perfschema/t/tampered_perfschema_table1.test
@ -6611,10 +6629,14 @@ share/mysql-test/suite/roles/revoke_all.result
share/mysql-test/suite/roles/revoke_all.test
share/mysql-test/suite/roles/rpl_definer.result
share/mysql-test/suite/roles/rpl_definer.test
share/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result
share/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.test
share/mysql-test/suite/roles/set_and_drop.result
share/mysql-test/suite/roles/set_and_drop.test
share/mysql-test/suite/roles/set_role-5232.result
share/mysql-test/suite/roles/set_role-5232.test
share/mysql-test/suite/roles/set_role-9614.result
share/mysql-test/suite/roles/set_role-9614.test
share/mysql-test/suite/roles/set_role-database-recursive.result
share/mysql-test/suite/roles/set_role-database-recursive.test
share/mysql-test/suite/roles/set_role-database-simple.result
@ -9734,6 +9756,7 @@ share/mysql-test/t/information_schema_inno.test
share/mysql-test/t/information_schema_parameters.test
share/mysql-test/t/information_schema_part.test
share/mysql-test/t/information_schema_routines.test
share/mysql-test/t/information_schema_stats.test
share/mysql-test/t/init_connect-master.opt
share/mysql-test/t/init_connect.test
share/mysql-test/t/init_connection_query_cache-master.opt
@ -10167,6 +10190,7 @@ share/mysql-test/t/ssl_7937.test
share/mysql-test/t/ssl_8k_key-master.opt
share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_and_innodb.test
share/mysql-test/t/ssl_ca.test
share/mysql-test/t/ssl_cert_verify.test
share/mysql-test/t/ssl_cipher-master.opt
share/mysql-test/t/ssl_cipher.test