3 files changed, 69 insertions, 4 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 95b7b4d8d3f4..95f2ffa6b521 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.1
+PORTVERSION=	5.5.2
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 623a9b647f89..c4f1e5eb2bbd 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.5.1-m2.tar.gz) = 7c4dc17913ef1824e15c97b2a7d4c642
-SHA256 (mysql-5.5.1-m2.tar.gz) = 26e8d98ae2341b8ee292bc173531560011e0150da63f2d873fad191d8dbce081
-SIZE (mysql-5.5.1-m2.tar.gz) = 21459964
+MD5 (mysql-5.5.2-m2.tar.gz) = cd3254f29561953ffb7c023cb1b825d2
+SHA256 (mysql-5.5.2-m2.tar.gz) = 683fce1b5470dca8b1f6e8f2817905a99608b73ebeb9733adf65e942c23d6b34
+SIZE (mysql-5.5.2-m2.tar.gz) = 20738817
diff --git a/databases/mysql55-server/files/patch-45058 b/databases/mysql55-server/files/patch-45058
new file mode 100644
index 000000000000..859ea1ae4585
--- /dev/null
+++ b/databases/mysql55-server/files/patch-45058
@@ -0,0 +1,65 @@
+=== 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