Update to 6.0.10 release.

5 files changed, 6 insertions, 131 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 853fa9219b4f..e21869dc8e24 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	6.0.9
-PORTREVISION?=	1
+PORTVERSION=	6.0.10
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-6.0
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index cec3afe5db86..2b68096b86ac 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-6.0.9-alpha.tar.gz) = e2c4c820356f4bdfbf50ec5b7c788140
-SHA256 (mysql-6.0.9-alpha.tar.gz) = 0888b9c822aa3f84c63e819f37df8081553c9f429dfc5a1cf19be16a9f69807f
-SIZE (mysql-6.0.9-alpha.tar.gz) = 35513752
+MD5 (mysql-6.0.10-alpha.tar.gz) = ebcefbaca78299f5820794350d0025d5
+SHA256 (mysql-6.0.10-alpha.tar.gz) = cde94d6d8c516f11a49599010059da7d4732d2fa2a33d5a7c3eea0ca1ca16b71
+SIZE (mysql-6.0.10-alpha.tar.gz) = 35997799
diff --git a/databases/mysql60-server/files/patch-64045 b/databases/mysql60-server/files/patch-64045
deleted file mode 100644
index a59228a1a5f8..000000000000
--- a/databases/mysql60-server/files/patch-64045
+++ /dev/null
@@ -1,115 +0,0 @@
-=== modified file 'include/my_pthread.h'
---- include/my_pthread.h	2008-12-14 11:36:15 +0000
-+++ include/my_pthread.h	2009-01-26 15:56:07 +0000
-@@ -621,6 +621,7 @@ extern pthread_mutexattr_t my_errorcheck
- 
- typedef ulong my_thread_id;
- 
-+extern my_bool my_threadattr_global_init(void);
- extern my_bool my_thread_global_init(void);
- extern void my_thread_global_end(void);
- extern my_bool my_thread_init(void);
-
-=== modified file 'mysys/my_init.c'
---- mysys/my_init.c	2009-01-16 11:49:33 +0000
-+++ mysys/my_init.c	2009-01-26 15:56:07 +0000
-@@ -84,11 +84,14 @@ my_bool my_init(void)
-   if (my_progname)
-     my_progname_short= my_progname + dirname_length(my_progname);
- 
--#if defined(THREAD) && defined(SAFE_MUTEX)
-+#if defined(THREAD)
-+  if (my_threadattr_global_init())
-+    return 1;
-+#  if defined(SAFE_MUTEX)
-   safe_mutex_global_init();		/* Must be called early */
--#endif
--#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
-+#  elif defined(MY_PTHREAD_FASTMUTEX)
-   fastmutex_global_init();              /* Must be called early */
-+#  endif
- #endif
-   netware_init();
- #ifdef THREAD
-
-=== modified file 'mysys/my_thr_init.c'
---- mysys/my_thr_init.c	2008-12-13 16:34:25 +0000
-+++ mysys/my_thr_init.c	2009-01-26 15:56:07 +0000
-@@ -68,6 +68,47 @@ nptl_pthread_exit_hack_handler(void *arg
- #endif /* TARGET_OS_LINUX */
- 
- 
-+
-+/*
-+  initialize thread attributes
-+
-+  SYNOPSIS
-+    my_threadattr_global_init()
-+
-+  RETURN  is error?
-+    FALSE  ok
-+    TRUE   error
-+*/
-+
-+my_bool my_threadattr_global_init(void)
-+{
-+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-+  /*
-+    Set mutex type to "fast" a.k.a "adaptive"
-+
-+    In this case the thread may steal the mutex from some other thread
-+    that is waiting for the same mutex.  This will save us some
-+    context switches but may cause a thread to 'starve forever' while
-+    waiting for the mutex (not likely if the code within the mutex is
-+    short).
-+  */
-+  pthread_mutexattr_init(&my_fast_mutexattr);  /* ?= MY_MUTEX_INIT_FAST */
-+  pthread_mutexattr_settype(&my_fast_mutexattr,
-+                            PTHREAD_MUTEX_ADAPTIVE_NP);
-+#endif
-+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-+  /*
-+    Set mutex type to "errorcheck"
-+  */
-+  pthread_mutexattr_init(&my_errorcheck_mutexattr);
-+  pthread_mutexattr_settype(&my_errorcheck_mutexattr,
-+                            PTHREAD_MUTEX_ERRORCHECK);
-+#endif
-+
-+  return FALSE;
-+}
-+
-+
- static uint get_thread_lib(void);
- 
- /*
-@@ -127,28 +168,6 @@ my_bool my_thread_global_init(void)
-   if (my_thread_init())
-     return 1;
- 
--#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
--  /*
--    Set mutex type to "fast" a.k.a "adaptive"
--
--    In this case the thread may steal the mutex from some other thread
--    that is waiting for the same mutex.  This will save us some
--    context switches but may cause a thread to 'starve forever' while
--    waiting for the mutex (not likely if the code within the mutex is
--    short).
--  */
--  pthread_mutexattr_init(&my_fast_mutexattr);
--  pthread_mutexattr_settype(&my_fast_mutexattr,
--                            PTHREAD_MUTEX_ADAPTIVE_NP);
--#endif
--#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
--  /*
--    Set mutex type to "errorcheck"
--  */
--  pthread_mutexattr_init(&my_errorcheck_mutexattr);
--  pthread_mutexattr_settype(&my_errorcheck_mutexattr,
--                            PTHREAD_MUTEX_ERRORCHECK);
--#endif
- 
-   /* Mutex uses by mysys */
-   pthread_mutex_init(&THR_LOCK_open,MY_MUTEX_INIT_FAST);
-
diff --git a/databases/mysql60-server/files/patch-include_myisam.h b/databases/mysql60-server/files/patch-include_myisam.h
deleted file mode 100644
index fd0aba7d7359..000000000000
--- a/databases/mysql60-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1332            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 1b49a01ac54b..2bac3909e6e2 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -3,6 +3,7 @@ bin/innochecksum
 bin/maria_chk
 bin/maria_dump_log
 bin/maria_ftdump
+bin/maria_non_trans_log
 bin/maria_pack
 bin/maria_read_log
 bin/my_print_defaults