mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Fix for MySQL Bug #45058.

Browse Source 
Feature safe:	yes
This commit is contained in:
Alex Dupre 2010-03-05 11:42:26 +00:00
parent 69822331c7
commit 9f63694df5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=250593
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/mysql51-server/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 5.1.44
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1

65
databases/mysql51-server/files/patch-45058 Normal file
View File

@ -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