Update to 5.1.46 release.

3 files changed, 4 insertions, 69 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index f8db78d1155c..e0f90b5d4158 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.45
+PORTVERSION=	5.1.46
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index fffe0d5ac4b5..06f715abac5f 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.45.tar.gz) = 06b5deb3a13c7600c38ba65b9f7e42c4
-SHA256 (mysql-5.1.45.tar.gz) = 7dc2fabbdd8ab1d2878ee749be9c56ffc9efe970f7f0f094aa94b18b3cd15a72
-SIZE (mysql-5.1.45.tar.gz) = 22457274
+MD5 (mysql-5.1.46.tar.gz) = 04f7c1422199c73a88a3d408b9161b63
+SHA256 (mysql-5.1.46.tar.gz) = d06651225f84f33fcf590c8630f70614c66775d39d1365a81669c90ae9f5e42c
+SIZE (mysql-5.1.46.tar.gz) = 23510197
diff --git a/databases/mysql51-server/files/patch-45058 b/databases/mysql51-server/files/patch-45058
deleted file mode 100644
index 859ea1ae4585..000000000000
--- a/databases/mysql51-server/files/patch-45058
+++ /dev/null
@@ -1,65 +0,0 @@
-=== modified file 'include/my_sys.h'
---- include/my_sys.h	2009-12-12 18:11:25 +0000
-+++ include/my_sys.h	2010-02-26 13:37:03 +0000
-@@ -950,7 +950,7 @@ extern my_bool resolve_charset(const cha
- extern my_bool resolve_collation(const char *cl_name,
-                                  CHARSET_INFO *default_cl,
-                                  CHARSET_INFO **cl);
--
-+extern void free_charsets(void);
- extern char *get_charsets_dir(char *buf);
- extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
- extern my_bool init_compiled_charsets(myf flags);
-
-=== modified file 'libmysql/libmysql.c'
---- libmysql/libmysql.c	2009-12-18 18:44:24 +0000
-+++ libmysql/libmysql.c	2010-02-26 13:37:03 +0000
-@@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
-   }
-   else
-   {
-+    free_charsets();
-     mysql_thread_end();
-   }
- 
-
-=== modified file 'mysys/charset.c'
---- mysys/charset.c	2009-12-15 09:48:29 +0000
-+++ mysys/charset.c	2010-02-26 13:37:03 +0000
-@@ -427,6 +427,12 @@ static void init_available_charsets(void
- }
- 
- 
-+static my_pthread_once_t charsets_template= MY_PTHREAD_ONCE_INIT;
-+void free_charsets(void)
-+{
-+  charsets_initialized= charsets_template;
-+}
-+
- uint get_collation_number(const char *name)
- {
-   my_pthread_once(&charsets_initialized, init_available_charsets);
-
-=== modified file 'mysys/my_init.c'
---- mysys/my_init.c	2009-12-12 18:11:25 +0000
-+++ mysys/my_init.c	2010-02-26 13:37:03 +0000
-@@ -165,6 +165,7 @@ void my_end(int infoflag)
-       my_print_open_files();
-     }
-   }
-+  free_charsets();
-   my_error_unregister_all();
-   my_once_free();
- 
-
-=== modified file 'sql/mysqld.cc'
---- sql/mysqld.cc	2010-02-05 12:55:20 +0000
-+++ sql/mysqld.cc	2010-02-26 13:37:03 +0000
-@@ -1287,6 +1287,7 @@ void clean_up(bool print_message)
-   lex_free();				/* Free some memory */
-   item_create_cleanup();
-   set_var_free();
-+  free_charsets();
-   if (!opt_noacl)
-   {
- #ifdef HAVE_DLOPEN