Attachment #137038 for bug #182426

View | Details | Raw Unified | Return to bug 182426
Collapse All | Expand All

Lines 21-27 USE_LDCONFIG= ${PREFIX}/lib/mysql Link Here

(-)b/databases/mariadb55-client/Makefile (-1 / +2 lines)
21		21
22	MAN1= msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \	22	MAN1= msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
23	mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \	23	mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
24	mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1	24	mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 \
		25	mysql_plugin.1
25		26
26	CLIENT_ONLY= yes	27	CLIENT_ONLY= yes
27		28




--- CMakeLists.txt.orig	2013-09-20 01:34:26.000000000 +0300
+++ CMakeLists.txt	2013-09-27 01:30:14.000000000 +0300
@@ -306,28 +306,8 @@
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(libservices)
 ADD_SUBDIRECTORY(scripts)

 IF(UNIX)
   ADD_SUBDIRECTORY(man)
 ENDIF()
@@ -339,7 +319,6 @@
   ADD_SUBDIRECTORY(win/upgrade_wizard)
   ADD_SUBDIRECTORY(win/packaging)
 ENDIF()
-ADD_SUBDIRECTORY(packaging/solaris)
 
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
@@ -366,6 +345,7 @@
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
+IF(FALSE)
 INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
                       COMPONENT Readme)
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
@@ -373,6 +353,7 @@
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()
+ENDIF()
 




--- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
@@ -24,9 +24,10 @@
 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
 
 # Find libexecinfo (library that contains backtrace_symbols etc)
-INCLUDE_DIRECTORIES(/usr/local/include)
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
 FIND_LIBRARY(EXECINFO NAMES execinfo)
 IF(EXECINFO)
  SET(LIBEXECINFO ${EXECINFO})
 ENDIF()
+ENDIF()

Lines 52-57 include/mysql/psi/mysql_thread.h Link Here

(-)b/databases/mariadb55-client/pkg-plist (+1 lines)
52	include/mysql/psi/psi.h	52	include/mysql/psi/psi.h
53	include/mysql/service_debug_sync.h	53	include/mysql/service_debug_sync.h
54	include/mysql/service_kill_statement.h	54	include/mysql/service_kill_statement.h
		55	include/mysql/service_logger.h
55	include/mysql/service_my_snprintf.h	56	include/mysql/service_my_snprintf.h
56	include/mysql/service_progress_report.h	57	include/mysql/service_progress_report.h
57	include/mysql/service_thd_alloc.h	58	include/mysql/service_thd_alloc.h

Lines 1-7 Link Here

(-)b/databases/mariadb55-server/Makefile (-10 / +15 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 327717 2013-09-20 16:13:47Z bapt $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 327717 2013-09-20 16:13:47Z bapt $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.31	4	PORTVERSION= 5.5.33a
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
Lines 18-23 PKGNAMESUFFIX?= -server Link Here
18	MAINTAINER= never@nevermind.kiev.ua	18	MAINTAINER= never@nevermind.kiev.ua
19	COMMENT?= Multithreaded SQL database (server)	19	COMMENT?= Multithreaded SQL database (server)
20		20
		21	LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
		22
21	SLAVEDIRS= databases/mariadb55-client	23	SLAVEDIRS= databases/mariadb55-client
22	USES= cmake	24	USES= cmake
23	NO_OPTIONS_SORT=yes	25	NO_OPTIONS_SORT=yes
Lines 44-51 CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ Link Here
44	-DINSTALL_SHAREDIR="share" \	46	-DINSTALL_SHAREDIR="share" \
45	-DINSTALL_SQLBENCHDIR="share/mysql" \	47	-DINSTALL_SQLBENCHDIR="share/mysql" \
46	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	48	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		49	-DWITH_UNIT_TESTS=0 \
47	-DWITH_LIBEDIT=0 \	50	-DWITH_LIBEDIT=0 \
48	-DWITH_LIBWRAP=1	51	-DWITH_LIBWRAP=1 \
		52	-DEXECINFO_ROOT=${LOCALBASE} \
		53	-DCOMPILATION_COMMENT="FreeBSD Ports"
49		54
50	.ifdef USE_MYSQL	55	.ifdef USE_MYSQL
51	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	56	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
Lines 56-73 USE_LDCONFIG= ${PREFIX}/lib/mysql Link Here
56		61
57	# MySQL-Server options	62	# MySQL-Server options
58	.if !defined(CLIENT_ONLY)	63	.if !defined(CLIENT_ONLY)
59	OPTIONS_DEFINE+= OQGRAPH PBXT MAXKEY	64	OPTIONS_DEFINE+= OQGRAPH MAXKEY
60		65
61	OQGRAPH_DESC= Open Query Graph Computation engine	66	OQGRAPH_DESC= Open Query Graph Computation engine
62	PBXT_DESC= MVCC-based transactional engine
63	MAXKEY_DESC= Change max key length from 1000 to 4000	67	MAXKEY_DESC= Change max key length from 1000 to 4000
64		68
65	OPTIONS_DEFAULT+= PBXT MAXKEY	69	OPTIONS_DEFAULT+= MAXKEY
66	.endif	70	.endif
67		71
68	NO_STAGE= yes	72	NO_STAGE= yes
69	.include <bsd.port.options.mk>	73	.include <bsd.port.options.mk>
70		74
		75	.if ${OSVERSION} >= 1000012
		76	CMAKE_ARGS+= -DWITH_JEMALLOC="no"
		77	.else
		78	CMAKE_ARGS+= -DWITH_JEMALLOC="bundled"
		79	.endif
		80
71	.if ${PORT_OPTIONS:MSSL}	81	.if ${PORT_OPTIONS:MSSL}
72	.if ${PORT_OPTIONS:MOPENSSL}	82	.if ${PORT_OPTIONS:MOPENSSL}
73	USE_OPENSSL= yes	83	USE_OPENSSL= yes
Lines 128-138 CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1 Link Here
128	PLIST_SUB+= OQGRAPH=""	138	PLIST_SUB+= OQGRAPH=""
129	LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs	139	LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs
130	.endif	140	.endif
131	.if empty(PORT_OPTIONS:MPBXT)
132	CMAKE_ARGS+= -DWITHOUT_PBXT_STORAGE_ENGINE=1
133	.else
134	CMAKE_ARGS+= -DWITH_PBXT_STORAGE_ENGINE=1
135	.endif
136	.if ${PORT_OPTIONS:MMAXKEY}	141	.if ${PORT_OPTIONS:MMAXKEY}
137	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h	142	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
138	.endif	143	.endif

Lines 1-2 Link Here

(-)b/databases/mariadb55-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.5.31.tar.gz) = 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28	1	SHA256 (mariadb-5.5.33a.tar.gz) = adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b
2	SIZE (mariadb-5.5.31.tar.gz) = 27888530	2	SIZE (mariadb-5.5.33a.tar.gz) = 45226492




--- CMakeLists.txt.orig	2013-09-20 01:34:26.000000000 +0300
+++ CMakeLists.txt	2013-09-27 01:39:19.000000000 +0300
@@ -310,17 +310,12 @@
 ADD_SUBDIRECTORY(support-files)
 
 IF(NOT WITHOUT_SERVER)

 
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -339,7 +334,6 @@
   ADD_SUBDIRECTORY(win/upgrade_wizard)
   ADD_SUBDIRECTORY(win/packaging)
 ENDIF()
-ADD_SUBDIRECTORY(packaging/solaris)
 
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
@@ -366,6 +360,7 @@
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
+IF(FALSE)
 INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
                       COMPONENT Readme)
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
@@ -373,6 +368,7 @@
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()
+ENDIF()
 




--- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
@@ -24,9 +24,10 @@
 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
 
 # Find libexecinfo (library that contains backtrace_symbols etc)
-INCLUDE_DIRECTORIES(/usr/local/include)
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
 FIND_LIBRARY(EXECINFO NAMES execinfo)
 IF(EXECINFO)
  SET(LIBEXECINFO ${EXECINFO})
 ENDIF()
+ENDIF()

Added Link Here

(-)b/databases/mariadb55-server/files/patch-sql_item_func.cc (+11 lines)
1	--- ./sql/item_func.cc.orig 2013-08-19 16:44:21.000000000 -0400
2	+++ ./sql/item_func.cc 2013-08-19 16:44:33.000000000 -0400
3	@@ -2341,7 +2341,7 @@
4
5	if (dec_negative && my_isinf(tmp))
6	tmp2= 0.0;
7	- else if (!dec_negative && my_isinf(value_mul_tmp))
8	+ else if (!dec_negative && my_isinf((double)value_mul_tmp))
9	tmp2= value;
10	else if (truncate)
11	{

Added Link Here

(-)b/databases/mariadb55-server/files/patch-sql_item_subselect.cc (+11 lines)
1	--- sql/item_subselect.cc.orig 2013-05-21 22:09:51.000000000 +0000
2	+++ sql/item_subselect.cc 2013-09-26 13:13:01.105197491 +0000
3	@@ -1317,7 +1317,7 @@
4	Item_subselect()
5	{
6	DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
7	- bool val_bool();
8	+// bool val_bool();
9	init(select_lex, new select_exists_subselect(this));
10	max_columns= UINT_MAX;
11	null_value= FALSE; //can't be NULL




--- sql/sql_trigger.cc.orig	2013-05-21 22:09:51.000000000 +0000
+++ sql/sql_trigger.cc	2013-09-26 13:15:55.450195525 +0000
@@ -192,32 +192,32 @@
 {
   {
     { 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 @@
 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
 };
 




--- sql/sql_view.cc.orig	2013-05-21 22:09:51.000000000 +0000
+++ sql/sql_view.cc	2013-09-26 13:16:16.065195172 +0000
@@ -742,46 +742,46 @@
 */
 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_VIEW_ALGO},
  {{ 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}

Lines 57-62 lib/mysql/plugin/qa_auth_server.so Link Here

(-)b/databases/mariadb55-server/pkg-plist (+1 lines)
57	lib/mysql/plugin/query_cache_info.so	57	lib/mysql/plugin/query_cache_info.so
58	lib/mysql/plugin/semisync_master.so	58	lib/mysql/plugin/semisync_master.so
59	lib/mysql/plugin/semisync_slave.so	59	lib/mysql/plugin/semisync_slave.so
		60	lib/mysql/plugin/sphinx.so
60	lib/mysql/plugin/sql_errlog.so	61	lib/mysql/plugin/sql_errlog.so
61	libexec/mysqld	62	libexec/mysqld
62	%%DATADIR%%/binary-configure	63	%%DATADIR%%/binary-configure

Return to bug 182426

Lines 1-6 Link Here

(-)b/databases/mariadb55-client/files/patch-CMakeLists.txt (-9 / +17 lines)
1	--- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200	1	--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
2	+++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200	2	+++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300
3	@@ -303,28 +303,8 @@	3	@@ -306,28 +306,8 @@
4	ADD_SUBDIRECTORY(extra)	4	ADD_SUBDIRECTORY(extra)
5	ADD_SUBDIRECTORY(libservices)	5	ADD_SUBDIRECTORY(libservices)
6	ADD_SUBDIRECTORY(scripts)	6	ADD_SUBDIRECTORY(scripts)
Lines 29-45 Link Here
29	IF(UNIX)	29	IF(UNIX)
30	ADD_SUBDIRECTORY(man)	30	ADD_SUBDIRECTORY(man)
31	ENDIF()	31	ENDIF()
32	@@ -362,6 +342,7 @@	32	@@ -339,7 +319,6 @@
		33	ADD_SUBDIRECTORY(win/upgrade_wizard)
		34	ADD_SUBDIRECTORY(win/packaging)
		35	ENDIF()
		36	-ADD_SUBDIRECTORY(packaging/solaris)
		37
		38	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
		39	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
		40	@@ -366,6 +345,7 @@
33	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}	41	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
34	)	42	)
35		43
36	+IF(FALSE)	44	+IF(FALSE)
37	INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql	45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
38	DESTINATION ${INSTALL_DOCREADMEDIR}	46	COMPONENT Readme)
39	COMPONENT Readme	47	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
40	@@ -372,6 +353,7 @@	48	@@ -373,6 +353,7 @@
41	IF(UNIX)	49	IF(UNIX)
42	INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)	50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
43	ENDIF()	51	ENDIF()
44	+ENDIF()	52	+ENDIF()
45		53

Lines 1-15 Link Here

(-)b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake (-10 / +11 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2013-01-13 02:13:17.000000000 +0200	1	--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
2	+++ cmake/os/FreeBSD.cmake 2013-01-13 02:14:15.000000000 +0200	2	+++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
3	@@ -24,6 +24,7 @@	3	@@ -24,9 +24,10 @@
4	# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)	4	# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
5		5
6	# Find libexecinfo (library that contains backtrace_symbols etc)	6	# Find libexecinfo (library that contains backtrace_symbols etc)
7	+IF(FALSE)	7	-INCLUDE_DIRECTORIES(/usr/local/include)
8	INCLUDE_DIRECTORIES(/usr/local/include)	8	-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
9	SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )	9	-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
10	SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")	10	+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
11	@@ -31,6 +32,7 @@	11	+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
		12	+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
		13	+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
		14	FIND_LIBRARY(EXECINFO NAMES execinfo)
12	IF(EXECINFO)	15	IF(EXECINFO)
13	SET(LIBEXECINFO ${EXECINFO})	16	SET(LIBEXECINFO ${EXECINFO})
14	ENDIF()
15	+ENDIF()

Lines 1-6 Link Here

(-)b/databases/mariadb55-server/files/patch-CMakeLists.txt (-9 / +17 lines)
1	--- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200	1	--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
2	+++ CMakeLists.txt 2012-12-23 02:25:55.000000000 +0200	2	+++ CMakeLists.txt 2013-09-27 01:39:19.000000000 +0300
3	@@ -306,17 +306,12 @@	3	@@ -310,17 +310,12 @@
4	ADD_SUBDIRECTORY(support-files)	4	ADD_SUBDIRECTORY(support-files)
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
Lines 18-34 Link Here
18		18
19	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	19	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
20	ADD_SUBDIRECTORY(internal)	20	ADD_SUBDIRECTORY(internal)
21	@@ -360,6 +355,7 @@	21	@@ -339,7 +334,6 @@
		22	ADD_SUBDIRECTORY(win/upgrade_wizard)
		23	ADD_SUBDIRECTORY(win/packaging)
		24	ENDIF()
		25	-ADD_SUBDIRECTORY(packaging/solaris)
		26
		27	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
		28	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
		29	@@ -366,6 +360,7 @@
22	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}	30	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
23	)	31	)
24		32
25	+IF(FALSE)	33	+IF(FALSE)
26	INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql	34	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
27	DESTINATION ${INSTALL_DOCREADMEDIR}	35	COMPONENT Readme)
28	COMPONENT Readme	36	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
29	@@ -370,6 +366,7 @@	37	@@ -373,6 +368,7 @@
30	IF(UNIX)	38	IF(UNIX)
31	INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)	39	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
32	ENDIF()	40	ENDIF()
33	+ENDIF()	41	+ENDIF()
34		42

Added Link Here

(-)b/databases/mariadb55-server/files/patch-sql_sql_trigger.cc (+50 lines)
1	--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000
2	+++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000
3	@@ -192,32 +192,32 @@
4	{
5	{
6	{ C_STRING_WITH_LEN("triggers") },
7	- my_offsetof(class Table_triggers_list, definitions_list),
8	+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
9	FILE_OPTIONS_STRLIST
10	},
11	{
12	{ C_STRING_WITH_LEN("sql_modes") },
13	- my_offsetof(class Table_triggers_list, definition_modes_list),
14	+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
15	FILE_OPTIONS_ULLLIST
16	},
17	{
18	{ C_STRING_WITH_LEN("definers") },
19	- my_offsetof(class Table_triggers_list, definers_list),
20	+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
21	FILE_OPTIONS_STRLIST
22	},
23	{
24	{ C_STRING_WITH_LEN("client_cs_names") },
25	- my_offsetof(class Table_triggers_list, client_cs_names),
26	+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
27	FILE_OPTIONS_STRLIST
28	},
29	{
30	{ C_STRING_WITH_LEN("connection_cl_names") },
31	- my_offsetof(class Table_triggers_list, connection_cl_names),
32	+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
33	FILE_OPTIONS_STRLIST
34	},
35	{
36	{ C_STRING_WITH_LEN("db_cl_names") },
37	- my_offsetof(class Table_triggers_list, db_cl_names),
38	+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
39	FILE_OPTIONS_STRLIST
40	},
41	{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
42	@@ -226,7 +226,7 @@
43	File_option sql_modes_parameters=
44	{
45	{ C_STRING_WITH_LEN("sql_modes") },
46	- my_offsetof(class Table_triggers_list, definition_modes_list),
47	+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
48	FILE_OPTIONS_ULLLIST
49	};
50

Added Link Here

(-)b/databases/mariadb55-server/files/patch-sql_sql_view.cc (+63 lines)
1	--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000
2	+++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000
3	@@ -742,46 +742,46 @@
4	*/
5	static File_option view_parameters[]=
6	{{{ C_STRING_WITH_LEN("query")},
7	- my_offsetof(TABLE_LIST, select_stmt),
8	+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
9	FILE_OPTIONS_ESTRING},
10	{{ C_STRING_WITH_LEN("md5")},
11	- my_offsetof(TABLE_LIST, md5),
12	+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
13	FILE_OPTIONS_STRING},
14	{{ C_STRING_WITH_LEN("updatable")},
15	- my_offsetof(TABLE_LIST, updatable_view),
16	+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
17	FILE_OPTIONS_ULONGLONG},
18	{{ C_STRING_WITH_LEN("algorithm")},
19	- my_offsetof(TABLE_LIST, algorithm),
20	+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
21	FILE_OPTIONS_VIEW_ALGO},
22	{{ C_STRING_WITH_LEN("definer_user")},
23	- my_offsetof(TABLE_LIST, definer.user),
24	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
25	FILE_OPTIONS_STRING},
26	{{ C_STRING_WITH_LEN("definer_host")},
27	- my_offsetof(TABLE_LIST, definer.host),
28	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
29	FILE_OPTIONS_STRING},
30	{{ C_STRING_WITH_LEN("suid")},
31	- my_offsetof(TABLE_LIST, view_suid),
32	+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
33	FILE_OPTIONS_ULONGLONG},
34	{{ C_STRING_WITH_LEN("with_check_option")},
35	- my_offsetof(TABLE_LIST, with_check),
36	+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
37	FILE_OPTIONS_ULONGLONG},
38	{{ C_STRING_WITH_LEN("timestamp")},
39	- my_offsetof(TABLE_LIST, timestamp),
40	+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
41	FILE_OPTIONS_TIMESTAMP},
42	{{ C_STRING_WITH_LEN("create-version")},
43	- my_offsetof(TABLE_LIST, file_version),
44	+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
45	FILE_OPTIONS_ULONGLONG},
46	{{ C_STRING_WITH_LEN("source")},
47	- my_offsetof(TABLE_LIST, source),
48	+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
49	FILE_OPTIONS_ESTRING},
50	{{(char*) STRING_WITH_LEN("client_cs_name")},
51	- my_offsetof(TABLE_LIST, view_client_cs_name),
52	+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
53	FILE_OPTIONS_STRING},
54	{{(char*) STRING_WITH_LEN("connection_cl_name")},
55	- my_offsetof(TABLE_LIST, view_connection_cl_name),
56	+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
57	FILE_OPTIONS_STRING},
58	{{(char*) STRING_WITH_LEN("view_body_utf8")},
59	- my_offsetof(TABLE_LIST, view_body_utf8),
60	+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
61	FILE_OPTIONS_ESTRING},
62	{{NullS, 0}, 0,
63	FILE_OPTIONS_STRING}