Attachment #137155 for bug #182547

Lines 7-13 Link Here

(-)databases/mariadb55-client/Makefile (-1 / +1 lines)
7		7
8	MASTERDIR= ${.CURDIR}/../mariadb55-server	8	MASTERDIR= ${.CURDIR}/../mariadb55-server
9		9
10	PKGMESSAGE= mustnotexist	10	FILESDIR= ${.CURDIR}/files
11	PATCHDIR= ${.CURDIR}/files	11	PATCHDIR= ${.CURDIR}/files
12	PLIST= ${.CURDIR}/pkg-plist	12	PLIST= ${.CURDIR}/pkg-plist
13		13

Lines 1-5 Link Here

(-)databases/mariadb55-client/files/patch-mysys_default.c (-8 / +13 lines)
1	--- mysys/default.c.orig 2012-12-17 03:57:40.000000000 +0200	1	--- mysys/default.c.orig 2013-10-01 21:15:03.544135869 +0200
2	+++ mysys/default.c 2012-12-17 04:00:28.000000000 +0200	2	+++ mysys/default.c 2013-10-01 21:15:38.871375504 +0200
3	@@ -89,7 +89,7 @@	3	@@ -89,7 +89,7 @@
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
Lines 18-28 Link Here
18	/*	18	/*
19	Ignore world-writable regular files.	19	Ignore world-writable regular files.
20	This is mainly done to protect us to not read a file created by	20	This is mainly done to protect us to not read a file created by
21	@@ -1229,6 +1229,7 @@	21	@@ -1226,10 +1226,8 @@
22	#if defined(DEFAULT_SYSCONFDIR)	22	errors += add_directory(alloc, "/etc/", dirs);
23	if (DEFAULT_SYSCONFDIR[0])	23	errors += add_directory(alloc, "/etc/mysql/", dirs);
24	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	24
25	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	25	-#if defined(DEFAULT_SYSCONFDIR)
26	#endif /* DEFAULT_SYSCONFDIR */	26	- if (DEFAULT_SYSCONFDIR[0])
		27	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
		28	-#endif /* DEFAULT_SYSCONFDIR */
		29	+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
		30	+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
27		31
28	#endif	32	#endif
		33

Line 0 Link Here

(-)databases/mariadb55-client/files/pkg-message.in (+7 lines)
	1	************************************************************************
	2
	3	MariaDB now also checks %%PREFIX%%/etc and %%PREFIX%%/etc/mysql. Please
	4	make sure to you don't have any stray my.cnf files from a previous
	5	mysql installation in these locations.
	6
	7	************************************************************************




# $FreeBSD: databases/mariadb55-client/Makefile 328886 2013-09-30 22:36:19Z flo $

PORTNAME=	mariadb
PKGNAMESUFFIX=	-client

COMMENT=	Multithreaded SQL database (client)

MASTERDIR=	${.CURDIR}/../mariadb55-server

PKGMESSAGE=	mustnotexist
PATCHDIR=	${.CURDIR}/files
PLIST=		${.CURDIR}/pkg-plist

LATEST_LINK=	mariadb55-client

CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*

CMAKE_ARGS+=	-DWITHOUT_SERVER=1

USE_LDCONFIG=	${PREFIX}/lib/mysql

CLIENT_ONLY=	yes

.include "${MASTERDIR}/Makefile"




--- 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)
-ADD_SUBDIRECTORY(sql/share)
 ADD_SUBDIRECTORY(support-files)
 
-IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
-  ADD_SUBDIRECTORY(sql)
-  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-  IF(WITH_EMBEDDED_SERVER) 
-   ADD_SUBDIRECTORY(libmysqld)
-   ADD_SUBDIRECTORY(libmysqld/examples)
-  ENDIF(WITH_EMBEDDED_SERVER)
-
-  ADD_SUBDIRECTORY(mysql-test)
-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-  ADD_SUBDIRECTORY(sql-bench)
-
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-    ADD_SUBDIRECTORY(internal)
-  ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-uln)
-ENDIF()
-
 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()
 
 INCLUDE(CPack)
 




--- client/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ client/CMakeLists.txt	2013-01-05 01:49:16.000000000 +0200
@@ -34,11 +34,12 @@
   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -49,15 +50,19 @@
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
 TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -75,10 +80,12 @@
 ENDIF(WIN32)
 
 # async_example is just a code example, do not install it.
+IF(FALSE)
 ADD_EXECUTABLE(async_example async_example.c)
 TARGET_LINK_LIBRARIES(async_example mysqlclient)
+ENDIF()
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap 
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)




--- cmake/jemalloc.cmake.orig	2013-09-20 00:34:22.000000000 +0200
+++ cmake/jemalloc.cmake	2013-09-27 22:46:05.791110010 +0200
@@ -37,9 +37,9 @@
     SET(WITH_JEMALLOC "no")
   ENDIF()
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC jemalloc)
+      SET(LIBJEMALLOC c)
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")




--- 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})




--- extra/CMakeLists.txt.orig	2012-12-17 03:38:29.000000000 +0200
+++ extra/CMakeLists.txt	2012-12-17 03:40:12.000000000 +0200
@@ -54,6 +54,7 @@
                   DEPENDS 
                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
 TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
 
@@ -74,11 +75,14 @@
 
 MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(replace mysys)
+ENDIF()
 IF(UNIX)
+IF(FALSE)
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
 
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
+ENDIF()
 
   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-extra_yassl_taocrypt_src_integer.cpp (+11 lines)
	1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-12-17 03:41:47.000000000 +0200
	2	+++ extra/yassl/taocrypt/src/integer.cpp 2012-12-17 03:42:47.000000000 +0200
	3	@@ -73,7 +73,7 @@
	4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
	5	size_type n, const void *)
	6	{
	7	- if (n > max_size())
	8	+ if (n > AlignedAllocator<T>::max_size())
	9	return 0;
	10	if (n == 0)
	11	return 0;




--- include/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ include/CMakeLists.txt	2012-12-23 00:48:29.000000000 +0200
@@ -58,13 +58,18 @@
 FOREACH(f ${HEADERS_GEN_CONFIGURE})
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 ENDFOREACH(f)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN "psi_abi*" EXCLUDE
+)
 
 STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
 STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
 
+IF(FALSE)
 INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
   FILES_MATCHING PATTERN "*.h"
   PATTERN CMakeFiles EXCLUDE
   PATTERN mysql EXCLUDE
   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-include_my_compare.h (+11 lines)
	1	--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200
	2	+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200
	3	@@ -40,7 +40,7 @@
	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
	5	*/
	6
	7	-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
	8	+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
	9	#define HA_MAX_KEY_SEG 32 /* Max segments for key */
	10
	11	#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-libservices_CMakeLists.txt (+9 lines)
	1	--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200
	3	@@ -24,4 +24,6 @@
	4	debug_sync_service.c)
	5
	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
	7	+IF(FALSE)
	8	INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
	9	+ENDIF()




--- man/CMakeLists.txt.orig	2012-12-22 21:30:12.000000000 +0200
+++ man/CMakeLists.txt	2012-12-22 21:30:54.000000000 +0200
@@ -30,9 +30,13 @@
 SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
               mysqltest_embedded.1 mysql_client_test_embedded.1)
 
+IF(FALSE)
 INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
 INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+ENDIF()
 INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
 INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
+IF(FALSE)
 INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
+ENDIF()
 




--- mysys/default.c.orig	2012-12-17 03:57:40.000000000 +0200
+++ mysys/default.c	2012-12-17 04:00:28.000000000 +0200
@@ -89,7 +89,7 @@
 
 /* Which directories are searched for options (and in which order) */
 
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
 static const char **default_directories = NULL;
 
@@ -785,7 +785,7 @@
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
+      return 0;
     /*
       Ignore world-writable regular files.
       This is mainly done to protect us to not read a file created by
@@ -1229,6 +1229,7 @@
 #if defined(DEFAULT_SYSCONFDIR)
   if (DEFAULT_SYSCONFDIR[0])
     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 #endif /* DEFAULT_SYSCONFDIR */
 
 #endif

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-regex_CMakeLists.txt (+9 lines)
	1	--- regex/CMakeLists.txt.orig 2012-12-23 00:42:41.000000000 +0200
	2	+++ regex/CMakeLists.txt 2012-12-23 00:42:54.000000000 +0200
	3	@@ -18,4 +18,6 @@
	4	SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
	5	ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
	6
	7	+IF(FALSE)
	8	INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
	9	+ENDIF()




--- scripts/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ scripts/CMakeLists.txt	2012-12-22 23:26:51.000000000 +0200
@@ -71,6 +71,7 @@
 )
 ENDIF()
 
+IF(FALSE)
 INSTALL(FILES 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -79,6 +80,7 @@
   ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )
+ENDIF()
 
 # TCMalloc hacks
 IF(MALLOC_LIB)
@@ -138,6 +140,7 @@
 SET(HOSTNAME "hostname")
 SET(MYSQLD_USER "mysql")
 
+IF(FALSE)
 # Required for mysqlbug until autotools are deprecated, once done remove these
 # and expand default cmake variables
 SET(CC ${CMAKE_C_COMPILER})
@@ -174,6 +177,7 @@
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
   )
+ENDIF()
 
 ENDIF(UNIX)
 
@@ -198,6 +202,7 @@
   SET(localstatedir ${MYSQL_DATADIR})
 ENDIF()
 
+IF()
 IF(UNIX)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
@@ -209,6 +214,7 @@
   COMPONENT Server
   )
 ENDIF()
+ENDIF()
 
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -260,6 +266,8 @@
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " ) 
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -315,18 +323,8 @@
   SET(BIN_SCRIPTS
     msql2mysql
     mysql_config
-    mysql_fix_extensions
-    mysql_setpermission
-    mysql_secure_installation
-    mysql_zap
     mysqlaccess
-    mysql_convert_table_format
     mysql_find_rows
-    mytop
-    mysqlhotcopy
-    mysqldumpslow
-    mysqld_multi
-    mysqld_safe
   )
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)




--- support-files/CMakeLists.txt.orig	2011-01-19 23:37:09.000000000 +0100
+++ support-files/CMakeLists.txt	2011-02-07 22:52:05.238344276 +0100
@@ -40,15 +40,18 @@
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
 ENDIF()
 
+IF(FALSE)
 FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
           DESTINATION ${inst_location} COMPONENT IniFiles)
 ENDFOREACH()
+ENDIF()
 
 IF(UNIX)
   SET(prefix ${CMAKE_INSTALL_PREFIX})
+IF(FALSE)
   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
@@ -66,8 +69,10 @@
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
   ENDIF()
+ENDIF()
 
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+IF(FALSE)
   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
@@ -85,3 +90,4 @@
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 ENDIF()
+ENDIF()




bin/msql2mysql
bin/mysql
bin/mysql_config
bin/mysql_find_rows
bin/mysql_waitpid
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbinlog
bin/mysqlcheck
bin/mysqldump
bin/mysqlimport
bin/mysqlshow
bin/mysqlslap
include/mysql/auth_dialog_client.h
include/mysql/client_plugin.h
include/mysql/decimal.h
include/mysql/errmsg.h
include/mysql/handler_state.h
include/mysql/keycache.h
include/mysql/m_ctype.h
include/mysql/m_string.h
include/mysql/ma_dyncol.h
include/mysql/my_alloc.h
include/mysql/my_attribute.h
include/mysql/my_compiler.h
include/mysql/my_config.h
include/mysql/my_dbug.h
include/mysql/my_decimal_limits.h
include/mysql/my_dir.h
include/mysql/my_getopt.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/my_valgrind.h
include/mysql/my_xml.h
include/mysql/mysql.h
include/mysql/mysql_com.h
include/mysql/mysql_embed.h
include/mysql/mysql_time.h
include/mysql/mysql_version.h
include/mysql/mysqld_ername.h
include/mysql/mysqld_error.h
include/mysql/plugin.h
include/mysql/plugin_audit.h
include/mysql/plugin_auth.h
include/mysql/plugin_auth_common.h
include/mysql/plugin_ftparser.h
include/mysql/psi/mysql_file.h
include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/service_debug_sync.h
include/mysql/service_kill_statement.h
include/mysql/service_logger.h
include/mysql/service_my_snprintf.h
include/mysql/service_progress_report.h
include/mysql/service_thd_alloc.h
include/mysql/service_thd_wait.h
include/mysql/service_thread_scheduler.h
include/mysql/services.h
include/mysql/sql_common.h
include/mysql/sql_state.h
include/mysql/sslopt-case.h
include/mysql/sslopt-longopts.h
include/mysql/sslopt-vars.h
include/mysql/typelib.h
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.so
lib/mysql/libmysqlclient.so.18
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.18
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
man/man1/mysql_find_rows.1.gz
man/man1/mysql_plugin.1.gz
man/man1/mysql_waitpid.1.gz
man/man1/mysqlaccess.1.gz
man/man1/mysqladmin.1.gz
man/man1/mysqlbinlog.1.gz
man/man1/mysqlcheck.1.gz
man/man1/mysqldump.1.gz
man/man1/mysqlimport.1.gz
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
share/aclocal/mysql.m4
@dirrmtry lib/mysql
@dirrm include/mysql/psi
@dirrm include/mysql

Lines 2-8 Link Here

(-)databases/mariadb55-server/Makefile (-1 / +5 lines)
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.33a	4	PORTVERSION= 5.5.33a
5	PORTREVISION?= 0	5	PORTREVISION?= 1
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/ \
8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
Lines 18-23 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	SUB_FILES= pkg-message
		22	PKGMESSAGE= ${WRKDIR}/pkg-message
		23
21	SLAVEDIRS= databases/mariadb55-client	24	SLAVEDIRS= databases/mariadb55-client
22	USES= cmake gmake	25	USES= cmake gmake
23	NO_OPTIONS_SORT=yes	26	NO_OPTIONS_SORT=yes
Lines 136-141 Link Here
136		139
137	post-patch:	140	post-patch:
138	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt	141	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
		142	@${REINPLACE_CMD} 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/mysys/default.c
139		143
140	.include <bsd.port.pre.mk>	144	.include <bsd.port.pre.mk>
141		145

Lines 1-6 Link Here

(-)databases/mariadb55-server/files/patch-mysys_default.c (-12 / +14 lines)
1	--- mysys/default.c.orig 2010-11-02 23:01:13.000000000 +0100	1	--- mysys/default.c.orig 2013-10-01 21:15:03.544135869 +0200
2	+++ mysys/default.c 2010-11-10 16:39:51.000000000 +0100	2	+++ mysys/default.c 2013-10-01 21:15:38.871375504 +0200
3	@@ -70,7 +70,7 @@	3	@@ -89,7 +89,7 @@
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
Lines 9-15 Link Here
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -711,7 +711,7 @@	12	@@ -785,7 +785,7 @@
13	{	13	{
14	MY_STAT stat_info;	14	MY_STAT stat_info;
15	if (!my_stat(name,&stat_info,MYF(0)))	15	if (!my_stat(name,&stat_info,MYF(0)))
Lines 18-31 Link Here
18	/*	18	/*
19	Ignore world-writable regular files.	19	Ignore world-writable regular files.
20	This is mainly done to protect us to not read a file created by	20	This is mainly done to protect us to not read a file created by
21	@@ -1153,7 +1153,10 @@	21	@@ -1226,10 +1226,8 @@
		22	errors += add_directory(alloc, "/etc/", dirs);
		23	errors += add_directory(alloc, "/etc/mysql/", dirs);
22		24
23	#if defined(DEFAULT_SYSCONFDIR)	25	-#if defined(DEFAULT_SYSCONFDIR)
24	if (DEFAULT_SYSCONFDIR[0])	26	- if (DEFAULT_SYSCONFDIR[0])
25	+ {	27	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
26	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	28	-#endif /* DEFAULT_SYSCONFDIR */
27	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	29	+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
28	+ }	30	+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
29	#endif /* DEFAULT_SYSCONFDIR */
30		31
31	#endif	32	#endif
		33

Line 0 Link Here

(-)databases/mariadb55-server/files/pkg-message.in (+11 lines)
	1	************************************************************************
	2
	3	Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
	4	the first time you start the MySQL server after an upgrade from an
	5	earlier version.
	6
	7	MariaDB now also checks %%PREFIX%%/etc and %%PREFIX%%/etc/mysql. Please
	8	make sure to you don't have any stray my.cnf files from a previous
	9	mysql installation in these locations.
	10
	11	************************************************************************

Lines 1-7 Link Here

(-)databases/mariadb55-server/pkg-message (-7 lines)
1	************************************************************************
2
3	Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
4	the first time you start the MySQL server after an upgrade from an
5	earlier version.
6
7	************************************************************************




# $FreeBSD: databases/mariadb55-server/Makefile 328885 2013-09-30 22:32:28Z flo $

PORTNAME?=	mariadb
PORTVERSION=	5.5.33a
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
PKGNAMESUFFIX?=	-server

MAINTAINER=	never@nevermind.kiev.ua
COMMENT?=	Multithreaded SQL database (server)

SLAVEDIRS=	databases/mariadb55-client
USES=		cmake gmake
NO_OPTIONS_SORT=yes

OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
OPTIONS_DEFAULT+=	SSL

FASTMTX_DESC=	Replace mutexes with spinlocks
OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
PORTSSL_DESC=	Use OpenSSL from port (requires OPENSSL to be set)

CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		-DINSTALL_INCLUDEDIR="include/mysql" \
		-DINSTALL_INFODIR="info" \
		-DINSTALL_LIBDIR="lib/mysql" \
		-DINSTALL_MANDIR="man" \
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		-DINSTALL_SBINDIR="libexec" \
		-DINSTALL_SCRIPTDIR="bin" \
		-DINSTALL_SHAREDIR="share" \
		-DINSTALL_SQLBENCHDIR="share/mysql" \
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DWITH_UNIT_TESTS=0 \
		-DWITH_LIBEDIT=0 \
		-DWITH_LIBWRAP=1 \
		-DEXECINFO_ROOT=${LOCALBASE} \
		-DCOMPILATION_COMMENT="FreeBSD Ports"

.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif

DATADIR=	${PREFIX}/share/mysql
USE_LDCONFIG=	${PREFIX}/lib/mysql

# MySQL-Server options
.if !defined(CLIENT_ONLY)
OPTIONS_DEFINE+=	OQGRAPH MAXKEY

OQGRAPH_DESC=	Open Query Graph Computation engine
MAXKEY_DESC=	Change max key length from 1000 to 4000

OPTIONS_DEFAULT+=	MAXKEY
.endif

.include <bsd.port.options.mk>

.if ${OSVERSION} < 1000052
LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif

.if ${OSVERSION} < 1000012
CMAKE_ARGS+=	-DWITH_JEMALLOC="bundled"
.else
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
.endif

.if ${PORT_OPTIONS:MSSL}
.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL=	yes
.if empty(PORT_OPTIONS:MPORTSSL)
WITH_OPENSSL_BASE=	yes
.else
WITH_OPENSSL_PORT=	yes
.endif
CMAKE_ARGS+=	-DWITH_SSL=yes
.else
CMAKE_ARGS+=	-DWITH_SSL=bundled
.endif
.else
CMAKE_FLAGS+=	-DWITH_SSL=no
.endif
.if ${PORT_OPTIONS:MFASTMTX}
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
.endif

# MySQL-Server part
.if !defined(CLIENT_ONLY)
USE_MYSQL=	yes
WANT_MYSQL_VER=	55m

LATEST_LINK=	mariadb55-server

CONFLICTS_INSTALL=	mysql-server-[345].* mariadb-server-5.3.* percona-server-5.*

USE_RC_SUBR=	mysql-server

USERS=		mysql
GROUPS=		mysql

CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1

post-install:
.if !defined(PACKAGE_BUILDING)
	@${CAT} ${PKGMESSAGE}
.endif

.if empty(PORT_OPTIONS:MOQGRAPH)
CMAKE_ARGS+=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
PLIST_SUB+=	OQGRAPH="@comment "
.else
USE_GCC?=	yes
CMAKE_ARGS+=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
PLIST_SUB+=	OQGRAPH=""
LIB_DEPENDS+=	boost_system:${PORTSDIR}/devel/boost-libs
.endif
.if ${PORT_OPTIONS:MMAXKEY}
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
.endif
.endif

post-patch:
	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt

.include <bsd.port.pre.mk>

.if ${ARCH} == "arm"
BROKEN=		Does not compile on arm
.endif

.include <bsd.port.post.mk>

Line 0 Link Here

(-)databases/mariadb55-server.orig/distinfo (+2 lines)
	1	SHA256 (mariadb-5.5.33a.tar.gz) = adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b
	2	SIZE (mariadb-5.5.33a.tar.gz) = 45226492

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/extra-patch-include_my_compare.h (+11 lines)
	1	--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200
	2	+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200
	3	@@ -40,7 +40,7 @@
	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
	5	*/
	6
	7	-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
	8	+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
	9	#define HA_MAX_KEY_SEG 32 /* Max segments for key */
	10
	11	#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)




#!/bin/sh
#
# $FreeBSD: databases/mariadb55-server/files/mysql-server.in 309955 2013-01-05 11:30:51Z flo $
#

# PROVIDE: mysql
# REQUIRE: LOGIN
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable mysql:
# mysql_enable (bool):	Set to "NO" by default.
#			Set it to "YES" to enable MySQL.
# mysql_limits (bool):	Set to "NO" by default.
#			Set it to yes to run `limits -e -U mysql`
#			just before mysql starts.
# mysql_dbdir (str):	Default to "/var/db/mysql"
#			Base database directory.
# mysql_pidfile (str):	Custum PID file path and name.
#			Default to "${mysql_dbdir}/${hostname}.pid".
# mysql_args (str):	Custom additional arguments to be passed
#			to mysqld_safe (default empty).
#

. /etc/rc.subr

name="mysql"
rcvar=mysql_enable

load_rc_config $name

: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}

mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
command="/usr/sbin/daemon"
command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
procname="%%PREFIX%%/libexec/mysqld"
start_precmd="${name}_prestart"
start_postcmd="${name}_poststart"
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"

mysql_create_auth_tables()
{
	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
}

mysql_prestart()
{
	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
		mysql_create_auth_tables || return 1
	fi
	if checkyesno mysql_limits; then
		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
	else
		return 0
	fi
}

mysql_poststart()
{
	local timeout=15
	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
		timeout=$(( timeout - 1 ))
		sleep 1
	done
	return 0
}

run_rc_command "$1"




--- 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)
-  ADD_SUBDIRECTORY(tests)
   ADD_SUBDIRECTORY(sql)
   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
   IF(WITH_EMBEDDED_SERVER) 
    ADD_SUBDIRECTORY(libmysqld)
-   ADD_SUBDIRECTORY(libmysqld/examples)
   ENDIF(WITH_EMBEDDED_SERVER)
 
-  ADD_SUBDIRECTORY(mysql-test)
-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-  ADD_SUBDIRECTORY(sql-bench)
 
   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()
 
 INCLUDE(CPack)
 




--- client/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ client/CMakeLists.txt	2012-12-23 02:37:04.000000000 +0200
@@ -26,6 +26,7 @@
 )
 
 ADD_DEFINITIONS(${SSL_DEFINES})
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
@@ -33,6 +34,7 @@
   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -40,6 +42,7 @@
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
 
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
@@ -48,17 +51,21 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
 TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
@@ -68,17 +75,20 @@
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+ENDIF()
 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
   MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
 ENDIF(WIN32)
 
+IF(FALSE)
 # async_example is just a code example, do not install it.
 ADD_EXECUTABLE(async_example async_example.c)
 TARGET_LINK_LIBRARIES(async_example mysqlclient)
+ENDIF()
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin 
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)




--- cmake/jemalloc.cmake.orig	2013-09-20 00:34:22.000000000 +0200
+++ cmake/jemalloc.cmake	2013-09-27 22:46:05.791110010 +0200
@@ -37,9 +37,9 @@
     SET(WITH_JEMALLOC "no")
   ENDIF()
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC jemalloc)
+      SET(LIBJEMALLOC c)
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")




--- 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})

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-extra_CMakeLists.txt (+11 lines)
	1	--- extra/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ extra/CMakeLists.txt 2012-12-23 02:41:57.000000000 +0200
	3	@@ -80,6 +80,8 @@
	4	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
	5	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
	6
	7	+IF(FALSE)
	8	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
	9	TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
	10	ENDIF()
	11	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-extra_yassl_taocrypt_src_integer.cpp (+11 lines)
	1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200
	2	+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200
	3	@@ -73,7 +73,7 @@
	4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
	5	size_type n, const void *)
	6	{
	7	- if (n > max_size())
	8	+ if (n > AlignedAllocator<T>::max_size())
	9	return 0;
	10	if (n == 0)
	11	return 0;




--- include/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ include/CMakeLists.txt	2012-12-23 05:49:42.000000000 +0200
@@ -54,17 +54,21 @@
   handler_state.h
 )
 
+IF(FALSE)
 INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
 FOREACH(f ${HEADERS_GEN_CONFIGURE})
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 ENDFOREACH(f)
 INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ENDIF()
 
 STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
 STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
 
+IF(FALSE)
 INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
   FILES_MATCHING PATTERN "*.h"
   PATTERN CMakeFiles EXCLUDE
   PATTERN mysql EXCLUDE
   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()




--- libmysql/CMakeLists.txt.orig	2013-03-15 22:24:20.000000000 +0200
+++ libmysql/CMakeLists.txt	2013-03-15 22:24:34.000000000 +0200
@@ -329,13 +329,14 @@
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
 
 # Visual Studio users need debug  static library for debug projects
 IF(MSVC)
  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
+IF(FALSE)
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -350,9 +351,11 @@
   ENDMACRO()
   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
 ENDIF()
+ENDIF()
 
 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)
+IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -399,3 +402,4 @@
     ENDFOREACH()
   ENDIF()
 ENDIF()
+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-libservices_CMakeLists.txt (+9 lines)
	1	--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200
	3	@@ -24,4 +24,6 @@
	4	debug_sync_service.c)
	5
	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
	7	+IF(FALSE)
	8	INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
	9	+ENDIF()




--- man/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ man/CMakeLists.txt	2012-12-23 05:38:24.000000000 +0200
@@ -16,13 +16,13 @@
 SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
 		myisamlog.1 myisampack.1 mysql.server.1
 		mysql_convert_table_format.1 mysql_fix_extensions.1
-		mysql_fix_privilege_tables.1 mysql_install_db.1
+		mysql_install_db.1
 		mysql_secure_installation.1 mysql_setpermission.1
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
 		mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
 		resolveip.1 mysqlbug.1)
-SET(MAN8_SERVER mysqld.8 mysqlmanager.8)
+SET(MAN8_SERVER mysqld.8)
 SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
 		mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
 		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
@@ -32,7 +32,9 @@
 
 INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
 INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+IF(FALSE)
 INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
 INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
 INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
+ENDIF()
 




--- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
@@ -70,7 +70,7 @@
 
 /* Which directories are searched for options (and in which order) */
 
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
 static const char **default_directories = NULL;
 
@@ -711,7 +711,7 @@
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
+      return 0;
     /*
       Ignore world-writable regular files.
       This is mainly done to protect us to not read a file created by
@@ -1153,7 +1153,10 @@
 
 #if defined(DEFAULT_SYSCONFDIR)
   if (DEFAULT_SYSCONFDIR[0])
+  {
     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
+  }
 #endif /* DEFAULT_SYSCONFDIR */
 
 #endif

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-regex_CMakeLists.txt (+9 lines)
	1	--- regex/CMakeLists.txt.orig 2012-12-23 06:02:57.000000000 +0200
	2	+++ regex/CMakeLists.txt 2012-12-23 06:03:01.000000000 +0200
	3	@@ -18,4 +18,6 @@
	4	SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
	5	ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
	6
	7	+IF(FALSE)
	8	INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
	9	+ENDIF()




--- scripts/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ scripts/CMakeLists.txt	2012-12-23 02:54:04.000000000 +0200
@@ -260,6 +260,8 @@
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " ) 
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -313,16 +315,11 @@
 ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(BIN_SCRIPTS
-    msql2mysql
-    mysql_config
     mysql_fix_extensions
     mysql_setpermission
     mysql_secure_installation
     mysql_zap
-    mysqlaccess
     mysql_convert_table_format
-    mysql_find_rows
-    mytop
     mysqlhotcopy
     mysqldumpslow
     mysqld_multi




--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
@@ -242,10 +242,10 @@
 
 if test -z "$MYSQL_HOME"
 then 
-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
   then
     log_error "WARNING: Found two instances of my.cnf -
-$MY_BASEDIR_VERSION/my.cnf and
+$MY_BASEDIR_VERSION/etc/my.cnf and
 $DATADIR/my.cnf
 IGNORING $DATADIR/my.cnf"
 
@@ -254,7 +254,7 @@
   then
     log_error "WARNING: Found $DATADIR/my.cnf
 The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
     MYSQL_HOME=$DATADIR
   else
     MYSQL_HOME=$MY_BASEDIR_VERSION




--- sql/CMakeLists.txt.orig	2013-05-22 01:09:51.000000000 +0300
+++ sql/CMakeLists.txt	2013-06-08 14:13:06.000000000 +0300
@@ -268,6 +268,7 @@
   VERBATIM
   )
 
+IF(FALSE)
 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 
 # Copy db.opt into data/test/
@@ -311,6 +312,7 @@
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
 ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
 ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
+ENDIF()
 
 IF(WIN32)
   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
@@ -353,8 +355,10 @@
   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
 ENDIF(WIN32)
 
+IF(FALSE)
 INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
   FILES_MATCHING PATTERN "*.h"
   PATTERN examples EXCLUDE
   PATTERN share EXCLUDE
   PATTERN CMakeFiles EXCLUDE)
+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/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}




--- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
@@ -900,7 +900,7 @@
        "connection before closing it",
        SESSION_VAR(net_interactive_timeout),
        CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
 
 static Sys_var_ulong Sys_join_buffer_size(
        "join_buffer_size",
@@ -1401,7 +1401,7 @@
        "Number of seconds to wait for more data from a connection before "
        "aborting the read",
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_read_timeout));
 
@@ -1416,7 +1416,7 @@
        "Number of seconds to wait for a block to be written to a connection "
        "before aborting the write",
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_write_timeout));
 
@@ -2257,7 +2257,7 @@
        "The number of seconds the server waits for activity on a "
        "connection before closing it",
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
+       VALID_RANGE(1, INT_MAX32/1000),
        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
 
 /** propagates changes to the relevant flag of @@optimizer_switch */




--- support-files/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
+++ support-files/CMakeLists.txt	2012-12-23 05:40:39.000000000 +0200
@@ -66,10 +66,11 @@
   ENDFOREACH()
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-    INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
   ENDIF()
 
+IF(FALSE)
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+ENDIF()
   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
   




MariaDB is a database server that offers drop-in replacement functionality for
MySQL1. MariaDB is built by some of the original authors of MySQL, with
assistance from the broader community of Free and open source software
developers. In addition to the core functionality of MySQL, MariaDB offers a
rich set of feature enhancements including alternate storage engines, server
optimizations, and patches.

MariaDB is primarily driven by developers at Monty Program, a company founded by
Michael "Monty" Widenius, the original author of MySQL, but this is not the
whole story about MariaDB. On the "About MariaDB" page you will find more
information about all participants in the MariaDB community, including storage
engines XtraDB and PBXT.

WWW: http://mariadb.org/

Line 0 Link Here

(-)databases/mariadb55-server.orig/pkg-message (+7 lines)
	1	************************************************************************
	2
	3	Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
	4	the first time you start the MySQL server after an upgrade from an
	5	earlier version.
	6
	7	************************************************************************




@stopdaemon mysql-server
bin/aria_chk
bin/aria_dump_log
bin/aria_ftdump
bin/aria_pack
bin/aria_read_log
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
bin/mysql_convert_table_format
bin/mysql_fix_extensions
bin/mysql_install_db
bin/mysql_plugin
bin/mysql_secure_installation
bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
bin/mysql_zap
bin/mysqlbug
bin/mysqld_multi
bin/mysqld_safe
bin/mysqldumpslow
bin/mysqlhotcopy
bin/mysqltest
bin/perror
bin/replace
bin/resolve_stack_dump
bin/resolveip
lib/mysql/libmysqld.a
lib/mysql/libmysqld.so
lib/mysql/libmysqld.so.18
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth_0x0100.so
lib/mysql/plugin/auth_pam.so
lib/mysql/plugin/auth_test_plugin.so
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
lib/mysql/plugin/dialog_examples.so
lib/mysql/plugin/feedback.so
lib/mysql/plugin/ha_archive.so
lib/mysql/plugin/ha_blackhole.so
lib/mysql/plugin/ha_federated.so
lib/mysql/plugin/ha_federatedx.so
lib/mysql/plugin/ha_innodb.so
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
lib/mysql/plugin/ha_sphinx.so
lib/mysql/plugin/handlersocket.so
lib/mysql/plugin/libdaemon_example.so
lib/mysql/plugin/mypluglib.so
lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/qa_auth_client.so
lib/mysql/plugin/qa_auth_interface.so
lib/mysql/plugin/qa_auth_server.so
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
lib/mysql/plugin/sphinx.so
lib/mysql/plugin/sql_errlog.so
libexec/mysqld
man/man1/innochecksum.1.gz
man/man1/my_print_defaults.1.gz
man/man1/myisam_ftdump.1.gz
man/man1/myisamchk.1.gz
man/man1/myisamlog.1.gz
man/man1/myisampack.1.gz
man/man1/mysql.server.1.gz
man/man1/mysql_convert_table_format.1.gz
man/man1/mysql_fix_extensions.1.gz
man/man1/mysql_install_db.1.gz
man/man1/mysql_secure_installation.1.gz
man/man1/mysql_setpermission.1.gz
man/man1/mysql_tzinfo_to_sql.1.gz
man/man1/mysql_upgrade.1.gz
man/man1/mysql_zap.1.gz
man/man1/mysqlbug.1.gz
man/man1/mysqld_multi.1.gz
man/man1/mysqld_safe.1.gz
man/man1/mysqldumpslow.1.gz
man/man1/mysqlhotcopy.1.gz
man/man1/mysqlman.1.gz
man/man1/mysqltest.1.gz
man/man1/perror.1.gz
man/man1/replace.1.gz
man/man1/resolve_stack_dump.1.gz
man/man1/resolveip.1.gz
man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
%%DATADIR%%/charsets/armscii8.xml
%%DATADIR%%/charsets/ascii.xml
%%DATADIR%%/charsets/cp1250.xml
%%DATADIR%%/charsets/cp1251.xml
%%DATADIR%%/charsets/cp1256.xml
%%DATADIR%%/charsets/cp1257.xml
%%DATADIR%%/charsets/cp850.xml
%%DATADIR%%/charsets/cp852.xml
%%DATADIR%%/charsets/cp866.xml
%%DATADIR%%/charsets/dec8.xml
%%DATADIR%%/charsets/geostd8.xml
%%DATADIR%%/charsets/greek.xml
%%DATADIR%%/charsets/hebrew.xml
%%DATADIR%%/charsets/hp8.xml
%%DATADIR%%/charsets/keybcs2.xml
%%DATADIR%%/charsets/koi8r.xml
%%DATADIR%%/charsets/koi8u.xml
%%DATADIR%%/charsets/latin1.xml
%%DATADIR%%/charsets/latin2.xml
%%DATADIR%%/charsets/latin5.xml
%%DATADIR%%/charsets/latin7.xml
%%DATADIR%%/charsets/macce.xml
%%DATADIR%%/charsets/macroman.xml
%%DATADIR%%/charsets/swe7.xml
%%DATADIR%%/config.huge.ini
%%DATADIR%%/config.medium.ini
%%DATADIR%%/config.small.ini
%%DATADIR%%/czech/errmsg.sys
%%DATADIR%%/danish/errmsg.sys
%%DATADIR%%/dutch/errmsg.sys
%%DATADIR%%/english/errmsg.sys
%%DATADIR%%/errmsg-utf8.txt
%%DATADIR%%/estonian/errmsg.sys
%%DATADIR%%/fill_help_tables.sql
%%DATADIR%%/french/errmsg.sys
%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/greek/errmsg.sys
%%DATADIR%%/hungarian/errmsg.sys
%%DATADIR%%/italian/errmsg.sys
%%DATADIR%%/japanese/errmsg.sys
%%DATADIR%%/korean/errmsg.sys
%%DATADIR%%/magic
%%DATADIR%%/my-huge.cnf
%%DATADIR%%/my-innodb-heavy-4G.cnf
%%DATADIR%%/my-large.cnf
%%DATADIR%%/my-medium.cnf
%%DATADIR%%/my-small.cnf
%%DATADIR%%/mysql-log-rotate
%%DATADIR%%/mysql.server
%%DATADIR%%/mysql_performance_tables.sql
%%DATADIR%%/mysql_system_tables.sql
%%DATADIR%%/mysql_system_tables_data.sql
%%DATADIR%%/mysql_test_data_timezone.sql
%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/ndb-config-2-node.ini
%%DATADIR%%/norwegian-ny/errmsg.sys
%%DATADIR%%/norwegian/errmsg.sys
%%DATADIR%%/polish/errmsg.sys
%%DATADIR%%/portuguese/errmsg.sys
%%DATADIR%%/romanian/errmsg.sys
%%DATADIR%%/russian/errmsg.sys
%%DATADIR%%/serbian/errmsg.sys
%%DATADIR%%/slovak/errmsg.sys
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
@dirrm %%DATADIR%%/ukrainian
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/slovak
@dirrm %%DATADIR%%/serbian
@dirrm %%DATADIR%%/russian
@dirrm %%DATADIR%%/romanian
@dirrm %%DATADIR%%/portuguese
@dirrm %%DATADIR%%/polish
@dirrm %%DATADIR%%/norwegian-ny
@dirrm %%DATADIR%%/norwegian
@dirrm %%DATADIR%%/korean
@dirrm %%DATADIR%%/japanese
@dirrm %%DATADIR%%/italian
@dirrm %%DATADIR%%/hungarian
@dirrm %%DATADIR%%/greek
@dirrm %%DATADIR%%/german
@dirrm %%DATADIR%%/french
@dirrm %%DATADIR%%/estonian
@dirrm %%DATADIR%%/english
@dirrm %%DATADIR%%/dutch
@dirrm %%DATADIR%%/danish
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%
@dirrm lib/mysql/plugin
@dirrm lib/mysql

Return to bug 182547

Line 0 Link Here

(-)databases/mariadb55-client.orig/Makefile (+24 lines)
	1	# $FreeBSD: databases/mariadb55-client/Makefile 328886 2013-09-30 22:36:19Z flo $
	2
	3	PORTNAME= mariadb
	4	PKGNAMESUFFIX= -client
	5
	6	COMMENT= Multithreaded SQL database (client)
	7
	8	MASTERDIR= ${.CURDIR}/../mariadb55-server
	9
	10	PKGMESSAGE= mustnotexist
	11	PATCHDIR= ${.CURDIR}/files
	12	PLIST= ${.CURDIR}/pkg-plist
	13
	14	LATEST_LINK= mariadb55-client
	15
	16	CONFLICTS_INSTALL= mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*
	17
	18	CMAKE_ARGS+= -DWITHOUT_SERVER=1
	19
	20	USE_LDCONFIG= ${PREFIX}/lib/mysql
	21
	22	CLIENT_ONLY= yes
	23
	24	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-CMakeLists.txt (+55 lines)
	1	--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
	2	+++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300
	3	@@ -306,28 +306,8 @@
	4	ADD_SUBDIRECTORY(extra)
	5	ADD_SUBDIRECTORY(libservices)
	6	ADD_SUBDIRECTORY(scripts)
	7	-ADD_SUBDIRECTORY(sql/share)
	8	ADD_SUBDIRECTORY(support-files)
	9
	10	-IF(NOT WITHOUT_SERVER)
	11	- ADD_SUBDIRECTORY(tests)
	12	- ADD_SUBDIRECTORY(sql)
	13	- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
	14	- IF(WITH_EMBEDDED_SERVER)
	15	- ADD_SUBDIRECTORY(libmysqld)
	16	- ADD_SUBDIRECTORY(libmysqld/examples)
	17	- ENDIF(WITH_EMBEDDED_SERVER)
	18	-
	19	- ADD_SUBDIRECTORY(mysql-test)
	20	- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
	21	- ADD_SUBDIRECTORY(sql-bench)
	22	-
	23	- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
	24	- ADD_SUBDIRECTORY(internal)
	25	- ENDIF()
	26	- ADD_SUBDIRECTORY(packaging/rpm-uln)
	27	-ENDIF()
	28	-
	29	IF(UNIX)
	30	ADD_SUBDIRECTORY(man)
	31	ENDIF()
	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 @@
	41	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
	42	)
	43
	44	+IF(FALSE)
	45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
	46	COMPONENT Readme)
	47	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
	48	@@ -373,6 +353,7 @@
	49	IF(UNIX)
	50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
	51	ENDIF()
	52	+ENDIF()
	53
	54	INCLUDE(CPack)
	55

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-client_CMakeLists.txt (+50 lines)
	1	--- client/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ client/CMakeLists.txt 2013-01-05 01:49:16.000000000 +0200
	3	@@ -34,11 +34,12 @@
	4	SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
	5	ENDIF(UNIX)
	6
	7	+IF(FALSE)
	8	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
	9	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
	10	TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
	11	SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
	12	-
	13	+ENDIF()
	14
	15	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
	16	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
	17	@@ -49,15 +50,19 @@
	18	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
	19	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
	20
	21	+IF(FALSE)
	22	MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
	23	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
	24	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
	25	+ENDIF()
	26
	27	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
	28	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
	29
	30	+IF(FALSE)
	31	MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
	32	TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
	33	+ENDIF()
	34
	35	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
	36	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
	37	@@ -75,10 +80,12 @@
	38	ENDIF(WIN32)
	39
	40	# async_example is just a code example, do not install it.
	41	+IF(FALSE)
	42	ADD_EXECUTABLE(async_example async_example.c)
	43	TARGET_LINK_LIBRARIES(async_example mysqlclient)
	44	+ENDIF()
	45
	46	-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
	47	+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
	48	PROPERTIES HAS_CXX TRUE)
	49
	50	ADD_DEFINITIONS(-DHAVE_DLOPEN)

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-cmake__jemalloc.cmake (+14 lines)
	1	--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200
	2	+++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200
	3	@@ -37,9 +37,9 @@
	4	SET(WITH_JEMALLOC "no")
	5	ENDIF()
	6	IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
	7	- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
	8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
	9	IF (HAVE_JEMALLOC)
	10	- SET(LIBJEMALLOC jemalloc)
	11	+ SET(LIBJEMALLOC c)
	12	ELSEIF (WITH_JEMALLOC STREQUAL "system")
	13	MESSAGE(FATAL_ERROR "system jemalloc is not found")
	14	ELSEIF (WITH_JEMALLOC STREQUAL "yes")

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-cmake_os_FreeBSD.cmake (+16 lines)
	1	--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
	2	+++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
	3	@@ -24,9 +24,10 @@
	4	# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
	5
	6	# Find libexecinfo (library that contains backtrace_symbols etc)
	7	-INCLUDE_DIRECTORIES(/usr/local/include)
	8	-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
	9	-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
	10	+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
	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)
	15	IF(EXECINFO)
	16	SET(LIBEXECINFO ${EXECINFO})

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-extra_CMakeLists.txt (+25 lines)
	1	--- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200
	2	+++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200
	3	@@ -54,6 +54,7 @@
	4	DEPENDS
	5	${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
	6
	7	+IF(FALSE)
	8	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
	9	TARGET_LINK_LIBRARIES(my_print_defaults mysys)
	10
	11	@@ -74,11 +75,14 @@
	12
	13	MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
	14	TARGET_LINK_LIBRARIES(replace mysys)
	15	+ENDIF()
	16	IF(UNIX)
	17	+IF(FALSE)
	18	MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
	19
	20	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
	21	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
	22	+ENDIF()
	23
	24	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
	25	TARGET_LINK_LIBRARIES(mysql_waitpid mysys)

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-include_CMakeLists.txt (+22 lines)
	1	--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200
	3	@@ -58,13 +58,18 @@
	4	FOREACH(f ${HEADERS_GEN_CONFIGURE})
	5	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
	6	ENDFOREACH(f)
	7	-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
	8	+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
	9	+ FILES_MATCHING PATTERN "*.h"
	10	+ PATTERN "psi_abi*" EXCLUDE
	11	+)
	12
	13	STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
	14	STRING(REPLACE ";" "\|" EXCL_RE "${EXCL_RE}")
	15
	16	+IF(FALSE)
	17	INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
	18	FILES_MATCHING PATTERN "*.h"
	19	PATTERN CMakeFiles EXCLUDE
	20	PATTERN mysql EXCLUDE
	21	REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
	22	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-man_CMakeLists.txt (+16 lines)
	1	--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200
	2	+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200
	3	@@ -30,9 +30,13 @@
	4	SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
	5	mysqltest_embedded.1 mysql_client_test_embedded.1)
	6
	7	+IF(FALSE)
	8	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
	9	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
	10	+ENDIF()
	11	INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
	12	INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
	13	+IF(FALSE)
	14	INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
	15	+ENDIF()
	16

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-scripts_CMakeLists.txt (+78 lines)
		1	--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
		2	+++ scripts/CMakeLists.txt 2012-12-22 23:26:51.000000000 +0200
		3	@@ -71,6 +71,7 @@
		4	)
		5	ENDIF()
		6
		7	+IF(FALSE)
		8	INSTALL(FILES
		9	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
		10	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
		11	@@ -79,6 +80,7 @@
		12	${FIX_PRIVILEGES_SQL}
		13	DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
		14	)
		15	+ENDIF()
		16
		17	# TCMalloc hacks
		18	IF(MALLOC_LIB)
		19	@@ -138,6 +140,7 @@
		20	SET(HOSTNAME "hostname")
		21	SET(MYSQLD_USER "mysql")
		22
		23	+IF(FALSE)
		24	# Required for mysqlbug until autotools are deprecated, once done remove these
		25	# and expand default cmake variables
		26	SET(CC ${CMAKE_C_COMPILER})
		27	@@ -174,6 +177,7 @@
		28	DESTINATION ${INSTALL_BINDIR}
		29	COMPONENT Server
		30	)
		31	+ENDIF()
		32
		33	ENDIF(UNIX)
		34
		35	@@ -198,6 +202,7 @@
		36	SET(localstatedir ${MYSQL_DATADIR})
		37	ENDIF()
		38
		39	+IF()
		40	IF(UNIX)
		41	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
		42	${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
		43	@@ -209,6 +214,7 @@
		44	COMPONENT Server
		45	)
		46	ENDIF()
		47	+ENDIF()
		48
		49
		50	SET(prefix "${CMAKE_INSTALL_PREFIX}")
		51	@@ -260,6 +266,8 @@
		52	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
		53	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
		54	SET(${var} "${${var}}-l${lib} " )
		55	+ ELSEIF(lib STREQUAL "-pthread")
		56	+ SET(${var} "${${var}}-pthread " )
		57	ELSE()
		58	SET(${var} "${${var}}-l${lib} " )
		59	ENDIF()
		60	@@ -315,18 +323,8 @@
		61	SET(BIN_SCRIPTS
		62	msql2mysql
		63	mysql_config
		64	- mysql_fix_extensions
65	- mysql_setpermission
66	- mysql_secure_installation
67	- mysql_zap
68	mysqlaccess
69	- mysql_convert_table_format
70	mysql_find_rows
71	- mytop
72	- mysqlhotcopy
73	- mysqldumpslow
74	- mysqld_multi
75	- mysqld_safe
76	)
77	FOREACH(file ${BIN_SCRIPTS})
78	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)

Line 0 Link Here

(-)databases/mariadb55-client.orig/files/patch-support-files_CMakeLists.txt (+37 lines)
	1	--- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100
	2	+++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100
	3	@@ -40,15 +40,18 @@
	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
	5	ENDIF()
	6
	7	+IF(FALSE)
	8	FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
	9	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
	10	${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
	11	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
	12	DESTINATION ${inst_location} COMPONENT IniFiles)
	13	ENDFOREACH()
	14	+ENDIF()
	15
	16	IF(UNIX)
	17	SET(prefix ${CMAKE_INSTALL_PREFIX})
	18	+IF(FALSE)
	19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure
	20	config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
	21	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
	22	@@ -66,8 +69,10 @@
	23	IF(INSTALL_SUPPORTFILESDIR)
	24	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
	25	ENDIF()
	26	+ENDIF()
	27
	28	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
	29	+IF(FALSE)
	30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
	31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
	32	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
	33	@@ -85,3 +90,4 @@
	34	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
	35	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
	36	ENDIF()
	37	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-client.orig/pkg-plist (+91 lines)
		1	bin/msql2mysql
		2	bin/mysql
		3	bin/mysql_config
		4	bin/mysql_find_rows
		5	bin/mysql_waitpid
		6	bin/mysqlaccess
		7	bin/mysqladmin
		8	bin/mysqlbinlog
		9	bin/mysqlcheck
		10	bin/mysqldump
		11	bin/mysqlimport
		12	bin/mysqlshow
		13	bin/mysqlslap
		14	include/mysql/auth_dialog_client.h
		15	include/mysql/client_plugin.h
		16	include/mysql/decimal.h
		17	include/mysql/errmsg.h
		18	include/mysql/handler_state.h
		19	include/mysql/keycache.h
		20	include/mysql/m_ctype.h
		21	include/mysql/m_string.h
		22	include/mysql/ma_dyncol.h
		23	include/mysql/my_alloc.h
		24	include/mysql/my_attribute.h
		25	include/mysql/my_compiler.h
		26	include/mysql/my_config.h
		27	include/mysql/my_dbug.h
		28	include/mysql/my_decimal_limits.h
		29	include/mysql/my_dir.h
		30	include/mysql/my_getopt.h
		31	include/mysql/my_global.h
		32	include/mysql/my_list.h
		33	include/mysql/my_net.h
		34	include/mysql/my_pthread.h
		35	include/mysql/my_sys.h
		36	include/mysql/my_valgrind.h
		37	include/mysql/my_xml.h
		38	include/mysql/mysql.h
		39	include/mysql/mysql_com.h
		40	include/mysql/mysql_embed.h
		41	include/mysql/mysql_time.h
		42	include/mysql/mysql_version.h
		43	include/mysql/mysqld_ername.h
		44	include/mysql/mysqld_error.h
		45	include/mysql/plugin.h
		46	include/mysql/plugin_audit.h
		47	include/mysql/plugin_auth.h
		48	include/mysql/plugin_auth_common.h
		49	include/mysql/plugin_ftparser.h
		50	include/mysql/psi/mysql_file.h
		51	include/mysql/psi/mysql_thread.h
		52	include/mysql/psi/psi.h
		53	include/mysql/service_debug_sync.h
		54	include/mysql/service_kill_statement.h
		55	include/mysql/service_logger.h
		56	include/mysql/service_my_snprintf.h
		57	include/mysql/service_progress_report.h
		58	include/mysql/service_thd_alloc.h
		59	include/mysql/service_thd_wait.h
		60	include/mysql/service_thread_scheduler.h
		61	include/mysql/services.h
		62	include/mysql/sql_common.h
		63	include/mysql/sql_state.h
		64	include/mysql/sslopt-case.h
65	include/mysql/sslopt-longopts.h
66	include/mysql/sslopt-vars.h
67	include/mysql/typelib.h
68	lib/mysql/libmysqlclient.a
69	lib/mysql/libmysqlclient.so
70	lib/mysql/libmysqlclient.so.18
71	lib/mysql/libmysqlclient_r.a
72	lib/mysql/libmysqlclient_r.so
73	lib/mysql/libmysqlclient_r.so.18
74	man/man1/msql2mysql.1.gz
75	man/man1/mysql.1.gz
76	man/man1/mysql_config.1.gz
77	man/man1/mysql_find_rows.1.gz
78	man/man1/mysql_plugin.1.gz
79	man/man1/mysql_waitpid.1.gz
80	man/man1/mysqlaccess.1.gz
81	man/man1/mysqladmin.1.gz
82	man/man1/mysqlbinlog.1.gz
83	man/man1/mysqlcheck.1.gz
84	man/man1/mysqldump.1.gz
85	man/man1/mysqlimport.1.gz
86	man/man1/mysqlshow.1.gz
87	man/man1/mysqlslap.1.gz
88	share/aclocal/mysql.m4
89	@dirrmtry lib/mysql
90	@dirrm include/mysql/psi
91	@dirrm include/mysql

Line 0 Link Here

(-)databases/mariadb55-server.orig/Makefile (+146 lines)
		1	# $FreeBSD: databases/mariadb55-server/Makefile 328885 2013-09-30 22:32:28Z flo $
		2
		3	PORTNAME?= mariadb
		4	PORTVERSION= 5.5.33a
		5	PORTREVISION?= 0
		6	CATEGORIES= databases ipv6
		7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		9	http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		10	http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		11	http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		12	http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		13	http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		14	http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
		15	http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
		16	PKGNAMESUFFIX?= -server
		17
		18	MAINTAINER= never@nevermind.kiev.ua
		19	COMMENT?= Multithreaded SQL database (server)
		20
		21	SLAVEDIRS= databases/mariadb55-client
		22	USES= cmake gmake
		23	NO_OPTIONS_SORT=yes
		24
		25	OPTIONS_DEFINE+= SSL OPENSSL PORTSSL FASTMTX
		26	OPTIONS_DEFAULT+= SSL
		27
		28	FASTMTX_DESC= Replace mutexes with spinlocks
		29	OPENSSL_DESC= Use OpenSSL instead of bundled yassl
		30	PORTSSL_DESC= Use OpenSSL from port (requires OPENSSL to be set)
		31
		32	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
		33	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		34	-DINSTALL_INCLUDEDIR="include/mysql" \
		35	-DINSTALL_INFODIR="info" \
		36	-DINSTALL_LIBDIR="lib/mysql" \
		37	-DINSTALL_MANDIR="man" \
		38	-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
		39	-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		40	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
		41	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		42	-DINSTALL_SBINDIR="libexec" \
		43	-DINSTALL_SCRIPTDIR="bin" \
		44	-DINSTALL_SHAREDIR="share" \
		45	-DINSTALL_SQLBENCHDIR="share/mysql" \
		46	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		47	-DWITH_UNIT_TESTS=0 \
		48	-DWITH_LIBEDIT=0 \
		49	-DWITH_LIBWRAP=1 \
		50	-DEXECINFO_ROOT=${LOCALBASE} \
		51	-DCOMPILATION_COMMENT="FreeBSD Ports"
		52
		53	.ifdef USE_MYSQL
		54	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
		55	.endif
		56
		57	DATADIR= ${PREFIX}/share/mysql
		58	USE_LDCONFIG= ${PREFIX}/lib/mysql
		59
		60	# MySQL-Server options
		61	.if !defined(CLIENT_ONLY)
		62	OPTIONS_DEFINE+= OQGRAPH MAXKEY
		63
		64	OQGRAPH_DESC= Open Query Graph Computation engine
65	MAXKEY_DESC= Change max key length from 1000 to 4000
66
67	OPTIONS_DEFAULT+= MAXKEY
68	.endif
69
70	.include <bsd.port.options.mk>
71
72	.if ${OSVERSION} < 1000052
73	LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
74	.endif
75
76	.if ${OSVERSION} < 1000012
77	CMAKE_ARGS+= -DWITH_JEMALLOC="bundled"
78	.else
79	CMAKE_ARGS+= -DWITH_JEMALLOC="system"
80	.endif
81
82	.if ${PORT_OPTIONS:MSSL}
83	.if ${PORT_OPTIONS:MOPENSSL}
84	USE_OPENSSL= yes
85	.if empty(PORT_OPTIONS:MPORTSSL)
86	WITH_OPENSSL_BASE= yes
87	.else
88	WITH_OPENSSL_PORT= yes
89	.endif
90	CMAKE_ARGS+= -DWITH_SSL=yes
91	.else
92	CMAKE_ARGS+= -DWITH_SSL=bundled
93	.endif
94	.else
95	CMAKE_FLAGS+= -DWITH_SSL=no
96	.endif
97	.if ${PORT_OPTIONS:MFASTMTX}
98	CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
99	.endif
100
101	# MySQL-Server part
102	.if !defined(CLIENT_ONLY)
103	USE_MYSQL= yes
104	WANT_MYSQL_VER= 55m
105
106	LATEST_LINK= mariadb55-server
107
108	CONFLICTS_INSTALL= mysql-server-[345].* mariadb-server-5.3.* percona-server-5.*
109
110	USE_RC_SUBR= mysql-server
111
112	USERS= mysql
113	GROUPS= mysql
114
115	CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
116	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
117
118	post-install:
119	.if !defined(PACKAGE_BUILDING)
120	@${CAT} ${PKGMESSAGE}
121	.endif
122
123	.if empty(PORT_OPTIONS:MOQGRAPH)
124	CMAKE_ARGS+= -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
125	PLIST_SUB+= OQGRAPH="@comment "
126	.else
127	USE_GCC?= yes
128	CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1
129	PLIST_SUB+= OQGRAPH=""
130	LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs
131	.endif
132	.if ${PORT_OPTIONS:MMAXKEY}
133	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
134	.endif
135	.endif
136
137	post-patch:
138	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
139
140	.include <bsd.port.pre.mk>
141
142	.if ${ARCH} == "arm"
143	BROKEN= Does not compile on arm
144	.endif
145
146	.include <bsd.port.post.mk>

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/mysql-server.in (+75 lines)
		1	#!/bin/sh
		2	#
		3	# $FreeBSD: databases/mariadb55-server/files/mysql-server.in 309955 2013-01-05 11:30:51Z flo $
		4	#
		5
		6	# PROVIDE: mysql
		7	# REQUIRE: LOGIN
		8	# KEYWORD: shutdown
		9
		10	#
		11	# Add the following line to /etc/rc.conf to enable mysql:
		12	# mysql_enable (bool): Set to "NO" by default.
		13	# Set it to "YES" to enable MySQL.
		14	# mysql_limits (bool): Set to "NO" by default.
		15	# Set it to yes to run `limits -e -U mysql`
		16	# just before mysql starts.
		17	# mysql_dbdir (str): Default to "/var/db/mysql"
		18	# Base database directory.
		19	# mysql_pidfile (str): Custum PID file path and name.
		20	# Default to "${mysql_dbdir}/${hostname}.pid".
		21	# mysql_args (str): Custom additional arguments to be passed
		22	# to mysqld_safe (default empty).
		23	#
		24
		25	. /etc/rc.subr
		26
		27	name="mysql"
		28	rcvar=mysql_enable
		29
		30	load_rc_config $name
		31
		32	: ${mysql_enable="NO"}
		33	: ${mysql_limits="NO"}
		34	: ${mysql_dbdir="/var/db/mysql"}
		35
		36	mysql_user="mysql"
		37	mysql_limits_args="-e -U ${mysql_user}"
		38	pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
		39	command="/usr/sbin/daemon"
		40	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
		41	procname="%%PREFIX%%/libexec/mysqld"
		42	start_precmd="${name}_prestart"
		43	start_postcmd="${name}_poststart"
		44	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
		45	mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
		46
		47	mysql_create_auth_tables()
		48	{
		49	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
		50	[ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
		51	}
		52
		53	mysql_prestart()
		54	{
		55	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
		56	mysql_create_auth_tables \|\| return 1
		57	fi
		58	if checkyesno mysql_limits; then
		59	eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
		60	else
		61	return 0
		62	fi
		63	}
		64
65	mysql_poststart()
66	{
67	local timeout=15
68	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
69	timeout=$(( timeout - 1 ))
70	sleep 1
71	done
72	return 0
73	}
74
75	run_rc_command "$1"

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-CMakeLists.txt (+44 lines)
	1	--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300
	2	+++ CMakeLists.txt 2013-09-27 01:39:19.000000000 +0300
	3	@@ -310,17 +310,12 @@
	4	ADD_SUBDIRECTORY(support-files)
	5
	6	IF(NOT WITHOUT_SERVER)
	7	- ADD_SUBDIRECTORY(tests)
	8	ADD_SUBDIRECTORY(sql)
	9	OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
	10	IF(WITH_EMBEDDED_SERVER)
	11	ADD_SUBDIRECTORY(libmysqld)
	12	- ADD_SUBDIRECTORY(libmysqld/examples)
	13	ENDIF(WITH_EMBEDDED_SERVER)
	14
	15	- ADD_SUBDIRECTORY(mysql-test)
	16	- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
	17	- ADD_SUBDIRECTORY(sql-bench)
	18
	19	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
	20	ADD_SUBDIRECTORY(internal)
	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 @@
	30	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
	31	)
	32
	33	+IF(FALSE)
	34	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
	35	COMPONENT Readme)
	36	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
	37	@@ -373,6 +368,7 @@
	38	IF(UNIX)
	39	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
	40	ENDIF()
	41	+ENDIF()
	42
	43	INCLUDE(CPack)
	44

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-client_CMakeLists.txt (+70 lines)
		1	--- client/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
		2	+++ client/CMakeLists.txt 2012-12-23 02:37:04.000000000 +0200
		3	@@ -26,6 +26,7 @@
		4	)
		5
		6	ADD_DEFINITIONS(${SSL_DEFINES})
		7	+IF(FALSE)
		8	MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
		9	${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
		10	TARGET_LINK_LIBRARIES(mysql mysqlclient)
		11	@@ -33,6 +34,7 @@
		12	TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
		13	SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
		14	ENDIF(UNIX)
		15	+ENDIF()
		16
		17	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
		18	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
		19	@@ -40,6 +42,7 @@
		20	SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
		21
		22
		23	+IF(FALSE)
		24	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
		25	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
		26
		27	@@ -48,17 +51,21 @@
		28
		29	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
		30	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
		31	+ENDIF()
		32
		33	MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
		34	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
		35	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
		36
		37	+IF(FALSE)
		38	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
		39	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
		40	+ENDIF()
		41
		42	MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
		43	TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
		44
		45	+IF(FALSE)
		46	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
		47	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
		48
		49	@@ -68,17 +75,20 @@
		50	MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
		51	SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
		52	TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
		53	+ENDIF()
		54
		55	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
		56	IF(WIN32)
		57	MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
		58	ENDIF(WIN32)
		59
		60	+IF(FALSE)
		61	# async_example is just a code example, do not install it.
		62	ADD_EXECUTABLE(async_example async_example.c)
		63	TARGET_LINK_LIBRARIES(async_example mysqlclient)
		64	+ENDIF()
65
66	-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
67	+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
68	PROPERTIES HAS_CXX TRUE)
69
70	ADD_DEFINITIONS(-DHAVE_DLOPEN)

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-include_CMakeLists.txt (+24 lines)
	1	--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ include/CMakeLists.txt 2012-12-23 05:49:42.000000000 +0200
	3	@@ -54,17 +54,21 @@
	4	handler_state.h
	5	)
	6
	7	+IF(FALSE)
	8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
	9	FOREACH(f ${HEADERS_GEN_CONFIGURE})
	10	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
	11	ENDFOREACH(f)
	12	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
	13	+ENDIF()
	14
	15	STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
	16	STRING(REPLACE ";" "\|" EXCL_RE "${EXCL_RE}")
	17
	18	+IF(FALSE)
	19	INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
	20	FILES_MATCHING PATTERN "*.h"
	21	PATTERN CMakeFiles EXCLUDE
	22	PATTERN mysql EXCLUDE
	23	REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
	24	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-libmysql_CMakeLists.txt (+36 lines)
	1	--- libmysql/CMakeLists.txt.orig 2013-03-15 22:24:20.000000000 +0200
	2	+++ libmysql/CMakeLists.txt 2013-03-15 22:24:34.000000000 +0200
	3	@@ -329,13 +329,14 @@
	4
	5	# Merge several convenience libraries into one big mysqlclient
	6	# and link them together into shared library.
	7	-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
	8	+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
	9
	10	# Visual Studio users need debug static library for debug projects
	11	IF(MSVC)
	12	INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
	13	ENDIF()
	14
	15	+IF(FALSE)
	16	IF(UNIX)
	17	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
	18	SET(DOT_VERSION ".${VERSION}")
	19	@@ -350,9 +351,11 @@
	20	ENDMACRO()
	21	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
	22	ENDIF()
	23	+ENDIF()
	24
	25	IF(NOT DISABLE_SHARED)
	26	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
	27	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)
	28	+IF(FALSE)
	29	IF(UNIX)
	30	# libtool compatability
	31	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
	32	@@ -399,3 +402,4 @@
	33	ENDFOREACH()
	34	ENDIF()
	35	ENDIF()
	36	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-man_CMakeLists.txt (+28 lines)
	1	--- man/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ man/CMakeLists.txt 2012-12-23 05:38:24.000000000 +0200
	3	@@ -16,13 +16,13 @@
	4	SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
	5	myisamlog.1 myisampack.1 mysql.server.1
	6	mysql_convert_table_format.1 mysql_fix_extensions.1
	7	- mysql_fix_privilege_tables.1 mysql_install_db.1
	8	+ mysql_install_db.1
	9	mysql_secure_installation.1 mysql_setpermission.1
	10	mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
	11	mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
	12	mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
	13	resolveip.1 mysqlbug.1)
	14	-SET(MAN8_SERVER mysqld.8 mysqlmanager.8)
	15	+SET(MAN8_SERVER mysqld.8)
	16	SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
	17	mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
	18	mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
	19	@@ -32,7 +32,9 @@
	20
	21	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
	22	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
	23	+IF(FALSE)
	24	INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
	25	INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
	26	INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
	27	+ENDIF()
	28

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-scripts_CMakeLists.txt (+28 lines)
	1	--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ scripts/CMakeLists.txt 2012-12-23 02:54:04.000000000 +0200
	3	@@ -260,6 +260,8 @@
	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
	5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
	6	SET(${var} "${${var}}-l${lib} " )
	7	+ ELSEIF(lib STREQUAL "-pthread")
	8	+ SET(${var} "${${var}}-pthread " )
	9	ELSE()
	10	SET(${var} "${${var}}-l${lib} " )
	11	ENDIF()
	12	@@ -313,16 +315,11 @@
	13	ELSE()
	14	# On Unix, most of the files end up in the bin directory
	15	SET(BIN_SCRIPTS
	16	- msql2mysql
	17	- mysql_config
	18	mysql_fix_extensions
	19	mysql_setpermission
	20	mysql_secure_installation
	21	mysql_zap
	22	- mysqlaccess
	23	mysql_convert_table_format
	24	- mysql_find_rows
	25	- mytop
	26	mysqlhotcopy
	27	mysqldumpslow
	28	mysqld_multi

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-scripts_mysqld_safe.sh (+24 lines)
	1	--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200
	2	+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200
	3	@@ -242,10 +242,10 @@
	4
	5	if test -z "$MYSQL_HOME"
	6	then
	7	- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
	8	+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
	9	then
	10	log_error "WARNING: Found two instances of my.cnf -
	11	-$MY_BASEDIR_VERSION/my.cnf and
	12	+$MY_BASEDIR_VERSION/etc/my.cnf and
	13	$DATADIR/my.cnf
	14	IGNORING $DATADIR/my.cnf"
	15
	16	@@ -254,7 +254,7 @@
	17	then
	18	log_error "WARNING: Found $DATADIR/my.cnf
	19	The data directory is a deprecated location for my.cnf, please move it to
	20	-$MY_BASEDIR_VERSION/my.cnf"
	21	+$MY_BASEDIR_VERSION/etc/my.cnf"
	22	MYSQL_HOME=$DATADIR
	23	else
	24	MYSQL_HOME=$MY_BASEDIR_VERSION

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-sql_CMakeLists.txt (+29 lines)
	1	--- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300
	2	+++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300
	3	@@ -268,6 +268,7 @@
	4	VERBATIM
	5	)
	6
	7	+IF(FALSE)
	8	IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
	9
	10	# Copy db.opt into data/test/
	11	@@ -311,6 +312,7 @@
	12	INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
	13	ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
	14	ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
	15	+ENDIF()
	16
	17	IF(WIN32)
	18	SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
	19	@@ -353,8 +355,10 @@
	20	TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
	21	ENDIF(WIN32)
	22
	23	+IF(FALSE)
	24	INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
	25	FILES_MATCHING PATTERN "*.h"
	26	PATTERN examples EXCLUDE
	27	PATTERN share EXCLUDE
	28	PATTERN CMakeFiles EXCLUDE)
	29	+ENDIF()

Line 0 Link Here

(-)databases/mariadb55-server.orig/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

Line 0 Link Here

(-)databases/mariadb55-server.orig/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}

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-sql_sys_vars.cc (+38 lines)
	1	--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200
	2	+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200
	3	@@ -900,7 +900,7 @@
	4	"connection before closing it",
	5	SESSION_VAR(net_interactive_timeout),
	6	CMD_LINE(REQUIRED_ARG),
	7	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
	8	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
	9
	10	static Sys_var_ulong Sys_join_buffer_size(
	11	"join_buffer_size",
	12	@@ -1401,7 +1401,7 @@
	13	"Number of seconds to wait for more data from a connection before "
	14	"aborting the read",
	15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
	16	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
	17	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
	19	ON_UPDATE(fix_net_read_timeout));
	20
	21	@@ -1416,7 +1416,7 @@
	22	"Number of seconds to wait for a block to be written to a connection "
	23	"before aborting the write",
	24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
	25	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
	26	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
	28	ON_UPDATE(fix_net_write_timeout));
	29
	30	@@ -2257,7 +2257,7 @@
	31	"The number of seconds the server waits for activity on a "
	32	"connection before closing it",
	33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
	34	- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
	35	+ VALID_RANGE(1, INT_MAX32/1000),
	36	DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
	37
	38	/** propagates changes to the relevant flag of @@optimizer_switch */

Line 0 Link Here

(-)databases/mariadb55-server.orig/files/patch-support-files_CMakeLists.txt (+15 lines)
	1	--- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
	2	+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200
	3	@@ -66,10 +66,11 @@
	4	ENDFOREACH()
	5	IF(INSTALL_SUPPORTFILESDIR)
	6	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
	7	- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
	8	ENDIF()
	9
	10	+IF(FALSE)
	11	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
	12	+ENDIF()
	13	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
	14	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
	15

Line 0 Link Here

(-)databases/mariadb55-server.orig/pkg-descr (+14 lines)
	1	MariaDB is a database server that offers drop-in replacement functionality for
	2	MySQL1. MariaDB is built by some of the original authors of MySQL, with
	3	assistance from the broader community of Free and open source software
	4	developers. In addition to the core functionality of MySQL, MariaDB offers a
	5	rich set of feature enhancements including alternate storage engines, server
	6	optimizations, and patches.
	7
	8	MariaDB is primarily driven by developers at Monty Program, a company founded by
	9	Michael "Monty" Widenius, the original author of MySQL, but this is not the
	10	whole story about MariaDB. On the "About MariaDB" page you will find more
	11	information about all participants in the MariaDB community, including storage
	12	engines XtraDB and PBXT.
	13
	14	WWW: http://mariadb.org/

Line 0 Link Here

(-)databases/mariadb55-server.orig/pkg-plist (+185 lines)
		1	@stopdaemon mysql-server
		2	bin/aria_chk
		3	bin/aria_dump_log
		4	bin/aria_ftdump
		5	bin/aria_pack
		6	bin/aria_read_log
		7	bin/innochecksum
		8	bin/my_print_defaults
		9	bin/myisam_ftdump
		10	bin/myisamchk
		11	bin/myisamlog
		12	bin/myisampack
		13	bin/mysql_convert_table_format
		14	bin/mysql_fix_extensions
		15	bin/mysql_install_db
		16	bin/mysql_plugin
		17	bin/mysql_secure_installation
		18	bin/mysql_setpermission
		19	bin/mysql_tzinfo_to_sql
		20	bin/mysql_upgrade
		21	bin/mysql_zap
		22	bin/mysqlbug
		23	bin/mysqld_multi
		24	bin/mysqld_safe
		25	bin/mysqldumpslow
		26	bin/mysqlhotcopy
		27	bin/mysqltest
		28	bin/perror
		29	bin/replace
		30	bin/resolve_stack_dump
		31	bin/resolveip
		32	lib/mysql/libmysqld.a
		33	lib/mysql/libmysqld.so
		34	lib/mysql/libmysqld.so.18
		35	lib/mysql/plugin/adt_null.so
		36	lib/mysql/plugin/auth_0x0100.so
		37	lib/mysql/plugin/auth_pam.so
		38	lib/mysql/plugin/auth_test_plugin.so
		39	lib/mysql/plugin/daemon_example.ini
		40	lib/mysql/plugin/dialog.so
		41	lib/mysql/plugin/dialog_examples.so
		42	lib/mysql/plugin/feedback.so
		43	lib/mysql/plugin/ha_archive.so
		44	lib/mysql/plugin/ha_blackhole.so
		45	lib/mysql/plugin/ha_federated.so
		46	lib/mysql/plugin/ha_federatedx.so
		47	lib/mysql/plugin/ha_innodb.so
		48	%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
		49	lib/mysql/plugin/ha_sphinx.so
		50	lib/mysql/plugin/handlersocket.so
		51	lib/mysql/plugin/libdaemon_example.so
		52	lib/mysql/plugin/mypluglib.so
		53	lib/mysql/plugin/mysql_clear_password.so
		54	lib/mysql/plugin/qa_auth_client.so
		55	lib/mysql/plugin/qa_auth_interface.so
		56	lib/mysql/plugin/qa_auth_server.so
		57	lib/mysql/plugin/query_cache_info.so
		58	lib/mysql/plugin/semisync_master.so
		59	lib/mysql/plugin/semisync_slave.so
		60	lib/mysql/plugin/sphinx.so
		61	lib/mysql/plugin/sql_errlog.so
		62	libexec/mysqld
		63	man/man1/innochecksum.1.gz
		64	man/man1/my_print_defaults.1.gz
65	man/man1/myisam_ftdump.1.gz
66	man/man1/myisamchk.1.gz
67	man/man1/myisamlog.1.gz
68	man/man1/myisampack.1.gz
69	man/man1/mysql.server.1.gz
70	man/man1/mysql_convert_table_format.1.gz
71	man/man1/mysql_fix_extensions.1.gz
72	man/man1/mysql_install_db.1.gz
73	man/man1/mysql_secure_installation.1.gz
74	man/man1/mysql_setpermission.1.gz
75	man/man1/mysql_tzinfo_to_sql.1.gz
76	man/man1/mysql_upgrade.1.gz
77	man/man1/mysql_zap.1.gz
78	man/man1/mysqlbug.1.gz
79	man/man1/mysqld_multi.1.gz
80	man/man1/mysqld_safe.1.gz
81	man/man1/mysqldumpslow.1.gz
82	man/man1/mysqlhotcopy.1.gz
83	man/man1/mysqlman.1.gz
84	man/man1/mysqltest.1.gz
85	man/man1/perror.1.gz
86	man/man1/replace.1.gz
87	man/man1/resolve_stack_dump.1.gz
88	man/man1/resolveip.1.gz
89	man/man8/mysqld.8.gz
90	%%DATADIR%%/binary-configure
91	%%DATADIR%%/charsets/Index.xml
92	%%DATADIR%%/charsets/README
93	%%DATADIR%%/charsets/armscii8.xml
94	%%DATADIR%%/charsets/ascii.xml
95	%%DATADIR%%/charsets/cp1250.xml
96	%%DATADIR%%/charsets/cp1251.xml
97	%%DATADIR%%/charsets/cp1256.xml
98	%%DATADIR%%/charsets/cp1257.xml
99	%%DATADIR%%/charsets/cp850.xml
100	%%DATADIR%%/charsets/cp852.xml
101	%%DATADIR%%/charsets/cp866.xml
102	%%DATADIR%%/charsets/dec8.xml
103	%%DATADIR%%/charsets/geostd8.xml
104	%%DATADIR%%/charsets/greek.xml
105	%%DATADIR%%/charsets/hebrew.xml
106	%%DATADIR%%/charsets/hp8.xml
107	%%DATADIR%%/charsets/keybcs2.xml
108	%%DATADIR%%/charsets/koi8r.xml
109	%%DATADIR%%/charsets/koi8u.xml
110	%%DATADIR%%/charsets/latin1.xml
111	%%DATADIR%%/charsets/latin2.xml
112	%%DATADIR%%/charsets/latin5.xml
113	%%DATADIR%%/charsets/latin7.xml
114	%%DATADIR%%/charsets/macce.xml
115	%%DATADIR%%/charsets/macroman.xml
116	%%DATADIR%%/charsets/swe7.xml
117	%%DATADIR%%/config.huge.ini
118	%%DATADIR%%/config.medium.ini
119	%%DATADIR%%/config.small.ini
120	%%DATADIR%%/czech/errmsg.sys
121	%%DATADIR%%/danish/errmsg.sys
122	%%DATADIR%%/dutch/errmsg.sys
123	%%DATADIR%%/english/errmsg.sys
124	%%DATADIR%%/errmsg-utf8.txt
125	%%DATADIR%%/estonian/errmsg.sys
126	%%DATADIR%%/fill_help_tables.sql
127	%%DATADIR%%/french/errmsg.sys
128	%%DATADIR%%/german/errmsg.sys
129	%%DATADIR%%/greek/errmsg.sys
130	%%DATADIR%%/hungarian/errmsg.sys
131	%%DATADIR%%/italian/errmsg.sys
132	%%DATADIR%%/japanese/errmsg.sys
133	%%DATADIR%%/korean/errmsg.sys
134	%%DATADIR%%/magic
135	%%DATADIR%%/my-huge.cnf
136	%%DATADIR%%/my-innodb-heavy-4G.cnf
137	%%DATADIR%%/my-large.cnf
138	%%DATADIR%%/my-medium.cnf
139	%%DATADIR%%/my-small.cnf
140	%%DATADIR%%/mysql-log-rotate
141	%%DATADIR%%/mysql.server
142	%%DATADIR%%/mysql_performance_tables.sql
143	%%DATADIR%%/mysql_system_tables.sql
144	%%DATADIR%%/mysql_system_tables_data.sql
145	%%DATADIR%%/mysql_test_data_timezone.sql
146	%%DATADIR%%/mysqld_multi.server
147	%%DATADIR%%/ndb-config-2-node.ini
148	%%DATADIR%%/norwegian-ny/errmsg.sys
149	%%DATADIR%%/norwegian/errmsg.sys
150	%%DATADIR%%/polish/errmsg.sys
151	%%DATADIR%%/portuguese/errmsg.sys
152	%%DATADIR%%/romanian/errmsg.sys
153	%%DATADIR%%/russian/errmsg.sys
154	%%DATADIR%%/serbian/errmsg.sys
155	%%DATADIR%%/slovak/errmsg.sys
156	%%DATADIR%%/spanish/errmsg.sys
157	%%DATADIR%%/swedish/errmsg.sys
158	%%DATADIR%%/ukrainian/errmsg.sys
159	@dirrm %%DATADIR%%/ukrainian
160	@dirrm %%DATADIR%%/swedish
161	@dirrm %%DATADIR%%/spanish
162	@dirrm %%DATADIR%%/slovak
163	@dirrm %%DATADIR%%/serbian
164	@dirrm %%DATADIR%%/russian
165	@dirrm %%DATADIR%%/romanian
166	@dirrm %%DATADIR%%/portuguese
167	@dirrm %%DATADIR%%/polish
168	@dirrm %%DATADIR%%/norwegian-ny
169	@dirrm %%DATADIR%%/norwegian
170	@dirrm %%DATADIR%%/korean
171	@dirrm %%DATADIR%%/japanese
172	@dirrm %%DATADIR%%/italian
173	@dirrm %%DATADIR%%/hungarian
174	@dirrm %%DATADIR%%/greek
175	@dirrm %%DATADIR%%/german
176	@dirrm %%DATADIR%%/french
177	@dirrm %%DATADIR%%/estonian
178	@dirrm %%DATADIR%%/english
179	@dirrm %%DATADIR%%/dutch
180	@dirrm %%DATADIR%%/danish
181	@dirrm %%DATADIR%%/czech
182	@dirrm %%DATADIR%%/charsets
183	@dirrm %%DATADIR%%
184	@dirrm lib/mysql/plugin
185	@dirrm lib/mysql