diff options
author | Alex Dupre <ale@FreeBSD.org> | 2010-04-13 15:12:34 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2010-04-13 15:12:34 +0000 |
commit | 88a770e5fefb528c5f2ae23c839826d7ec45bee6 (patch) | |
tree | 173a7155fa1ae8af9b67a17ecff557e93ced3193 /databases/percona55-server/files | |
parent | 7f427616b2e7cdeca3b4c61b3c356a79c738fa98 (diff) | |
download | ports-88a770e5fefb528c5f2ae23c839826d7ec45bee6.tar.gz ports-88a770e5fefb528c5f2ae23c839826d7ec45bee6.zip |
- Update to 5.5.3-m3 release
- Switch to use USERS and GROUPS [1]
PR: ports/144887 [1]
Submitted by: Sevan Janiyan <venture37@geeklan.co.uk> [1]
Notes
Notes:
svn path=/head/; revision=252647
Diffstat (limited to 'databases/percona55-server/files')
-rw-r--r-- | databases/percona55-server/files/patch-45058 | 65 | ||||
-rw-r--r-- | databases/percona55-server/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | databases/percona55-server/files/patch-configure | 22 | ||||
-rw-r--r-- | databases/percona55-server/files/patch-configure.am | 13 | ||||
-rw-r--r-- | databases/percona55-server/files/patch-man::Makefile.in | 8 |
5 files changed, 24 insertions, 97 deletions
diff --git a/databases/percona55-server/files/patch-45058 b/databases/percona55-server/files/patch-45058 deleted file mode 100644 index 859ea1ae4585..000000000000 --- a/databases/percona55-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 diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index d5296181d21a..5ee27b803576 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,8 +1,8 @@ ---- Makefile.in.orig 2009-12-07 20:09:53.000000000 +0100 -+++ Makefile.in 2009-12-29 11:32:35.000000000 +0100 -@@ -408,14 +408,7 @@ - EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt +--- Makefile.in.orig 2010-03-24 21:30:45.000000000 +0100 ++++ Makefile.in 2010-04-13 16:21:29.000000000 +0200 +@@ -416,15 +416,7 @@ + README COPYING EXCEPTIONS-CLIENT \ + CMakeLists.txt configure.cmake config.h.cmake BUILD-CMAKE -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common scripts \ @@ -11,7 +11,8 @@ - @sql_server@ @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files sql-bench \ -- win +- win \ +- cmake +SUBDIRS = DIST_SUBDIRS = . include Docs zlib \ diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure deleted file mode 100644 index 2bd3f24144e6..000000000000 --- a/databases/percona55-server/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2009-07-22 12:42:18.000000000 +0200 -+++ configure 2009-07-22 12:41:05.000000000 +0200 -@@ -4000,7 +4000,7 @@ - - else - -- ENABLE_DTRACE="yes" -+ ENABLE_DTRACE="no" - - - fi -@@ -24613,8 +24613,8 @@ - # Some system specific hacks - # - --MAX_C_OPTIMIZE="-O3" --MAX_CXX_OPTIMIZE="-O3" -+MAX_C_OPTIMIZE="" -+MAX_CXX_OPTIMIZE="" - - case $SYSTEM_TYPE in - *solaris2.7*) diff --git a/databases/percona55-server/files/patch-configure.am b/databases/percona55-server/files/patch-configure.am new file mode 100644 index 000000000000..ba1bd22648e6 --- /dev/null +++ b/databases/percona55-server/files/patch-configure.am @@ -0,0 +1,13 @@ +--- configure.am.orig 2010-04-13 16:22:46.000000000 +0200 ++++ configure.am 2010-04-13 16:23:40.000000000 +0200 +@@ -25756,8 +25756,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) diff --git a/databases/percona55-server/files/patch-man::Makefile.in b/databases/percona55-server/files/patch-man::Makefile.in index 0b15e2d4ca03..cebf7d7d08bf 100644 --- a/databases/percona55-server/files/patch-man::Makefile.in +++ b/databases/percona55-server/files/patch-man::Makefile.in @@ -1,6 +1,6 @@ ---- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 -+++ man/Makefile.in Tue Nov 7 08:19:50 2006 -@@ -363,8 +363,8 @@ +--- man/Makefile.in.orig 2010-04-13 16:40:58.000000000 +0200 ++++ man/Makefile.in 2010-04-13 16:41:19.000000000 +0200 +@@ -388,8 +388,8 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -8,6 +8,6 @@ -man8_MANS = @man8_files@ +man1_MANS = +man8_MANS = - EXTRA_DIST = $(man1_MANS) $(man8_MANS) + EXTRA_DIST = $(man1_MANS) $(man8_MANS) CMakeLists.txt all: all-am |