diff options
author | Florian Smeets <flo@FreeBSD.org> | 2018-03-31 18:22:51 +0000 |
---|---|---|
committer | Florian Smeets <flo@FreeBSD.org> | 2018-03-31 18:22:51 +0000 |
commit | d6b687afad241d49f5de626189424ed88ab84e40 (patch) | |
tree | 1771e377e9b4cd9f345095115366e818fa0b25f5 /databases/percona56-server | |
parent | a451970324abac9ec45b2b56f39a3a974e915dc9 (diff) | |
download | ports-d6b687afad241d49f5de626189424ed88ab84e40.tar.gz ports-d6b687afad241d49f5de626189424ed88ab84e40.zip |
- add license
- fix build with clang 6.0
Notes
Notes:
svn path=/head/; revision=466072
Diffstat (limited to 'databases/percona56-server')
-rw-r--r-- | databases/percona56-server/Makefile | 2 | ||||
-rw-r--r-- | databases/percona56-server/files/patch-sql_sql_trigger.cc | 50 | ||||
-rw-r--r-- | databases/percona56-server/files/patch-sql_sql_view.cc | 63 |
3 files changed, 2 insertions, 113 deletions
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 6894d94d06e5..06576982674d 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -12,6 +12,8 @@ DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +LICENSE?= GPLv2+ + BROKEN_armv6= fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier BROKEN_armv7= fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier NOT_FOR_ARCHS= powerpc64 diff --git a/databases/percona56-server/files/patch-sql_sql_trigger.cc b/databases/percona56-server/files/patch-sql_sql_trigger.cc deleted file mode 100644 index 7e308976b3ec..000000000000 --- a/databases/percona56-server/files/patch-sql_sql_trigger.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 -+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 -@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= - { - { - { C_STRING_WITH_LEN("triggers") }, -- my_offsetof(class Table_triggers_list, definitions_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }, - { - { C_STRING_WITH_LEN("definers") }, -- my_offsetof(class Table_triggers_list, definers_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("client_cs_names") }, -- my_offsetof(class Table_triggers_list, client_cs_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("connection_cl_names") }, -- my_offsetof(class Table_triggers_list, connection_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("db_cl_names") }, -- my_offsetof(class Table_triggers_list, db_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), - FILE_OPTIONS_STRLIST - }, - { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]= - File_option sql_modes_parameters= - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - diff --git a/databases/percona56-server/files/patch-sql_sql_view.cc b/databases/percona56-server/files/patch-sql_sql_view.cc deleted file mode 100644 index 5f4d92d7eebf..000000000000 --- a/databases/percona56-server/files/patch-sql_sql_view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200 -+++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200 -@@ -730,46 +730,46 @@ static const int required_view_parameters= 14; - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast<int>(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} |