diff options
Diffstat (limited to 'databases/mysql55-client/patches')
9 files changed, 27 insertions, 27 deletions
diff --git a/databases/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt index 54089387ee0..b42cd612890 100644 --- a/databases/mysql55-client/patches/patch-CMakeLists.txt +++ b/databases/mysql55-client/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2011/07/08 09:32:07 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2012/10/01 15:54:40 adam Exp $ Split configuration between mysql-client and mysql-server. ---- CMakeLists.txt.orig 2011-03-31 13:36:18.000000000 +0000 +--- CMakeLists.txt.orig 2012-08-29 08:50:46.000000000 +0000 +++ CMakeLists.txt -@@ -281,7 +281,6 @@ ADD_SUBDIRECTORY(strings) +@@ -292,7 +292,6 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) @@ -12,7 +12,7 @@ Split configuration between mysql-client and mysql-server. IF(WITH_UNIT_TESTS) -@@ -293,9 +292,13 @@ IF(WITH_UNIT_TESTS) +@@ -304,9 +303,13 @@ IF(WITH_UNIT_TESTS) ENDIF() ADD_SUBDIRECTORY(extra) @@ -28,7 +28,7 @@ Split configuration between mysql-client and mysql-server. ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) -@@ -308,11 +311,7 @@ IF(NOT WITHOUT_SERVER) +@@ -319,11 +322,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) @@ -37,6 +37,6 @@ Split configuration between mysql-client and mysql-server. - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() - ENDIF() - - INCLUDE(cmake/abi_check.cmake) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) + ENDIF() diff --git a/databases/mysql55-client/patches/patch-client_mysqladmin.cc b/databases/mysql55-client/patches/patch-client_mysqladmin.cc index dda037c16a6..9912158c1db 100644 --- a/databases/mysql55-client/patches/patch-client_mysqladmin.cc +++ b/databases/mysql55-client/patches/patch-client_mysqladmin.cc @@ -1,10 +1,10 @@ -$NetBSD: patch-client_mysqladmin.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-client_mysqladmin.cc,v 1.2 2012/10/01 15:54:40 adam Exp $ Redefine signals for Irix. --- client/mysqladmin.cc.orig 2010-02-04 11:36:52.000000000 +0000 +++ client/mysqladmin.cc -@@ -322,8 +322,14 @@ int main(int argc,char *argv[]) +@@ -332,8 +332,14 @@ int main(int argc,char *argv[]) if (tty_password) opt_password = get_tty_password(NullS); diff --git a/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc index 5a65da17ba6..9ba47156d4f 100644 --- a/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc +++ b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc @@ -1,12 +1,12 @@ -$NetBSD: patch-client_mysqlbinlog.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-client_mysqlbinlog.cc,v 1.2 2012/10/01 15:54:40 adam Exp $ * Portability: include <bstring.h> if exists. ---- client/mysqlbinlog.cc.orig 2010-02-04 11:36:52.000000000 +0000 +--- client/mysqlbinlog.cc.orig 2012-08-29 08:50:46.000000000 +0000 +++ client/mysqlbinlog.cc -@@ -35,6 +35,9 @@ - #include "log_event.h" +@@ -38,6 +38,9 @@ #include "sql_common.h" + #include "my_dir.h" #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE +#ifdef NEEDS_BSTRING_H +#include <bstring.h> /* defines bzero() */ diff --git a/databases/mysql55-client/patches/patch-client_sql_string.cc b/databases/mysql55-client/patches/patch-client_sql_string.cc index a0d257dd7a1..85d84326591 100644 --- a/databases/mysql55-client/patches/patch-client_sql_string.cc +++ b/databases/mysql55-client/patches/patch-client_sql_string.cc @@ -1,10 +1,10 @@ -$NetBSD: patch-client_sql_string.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-client_sql_string.cc,v 1.2 2012/10/01 15:54:40 adam Exp $ * Portability: include <bstring.h> if exists. --- client/sql_string.cc.orig 2010-02-04 11:36:53.000000000 +0000 +++ client/sql_string.cc -@@ -27,6 +27,10 @@ extern void sql_element_free(void *ptr); +@@ -29,6 +29,10 @@ extern void sql_element_free(void *ptr); #include "sql_string.h" diff --git a/databases/mysql55-client/patches/patch-mysys_stacktrace.c b/databases/mysql55-client/patches/patch-mysys_stacktrace.c index 1542b4d79a3..14aff856bf7 100644 --- a/databases/mysql55-client/patches/patch-mysys_stacktrace.c +++ b/databases/mysql55-client/patches/patch-mysys_stacktrace.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mysys_stacktrace.c,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-mysys_stacktrace.c,v 1.2 2012/10/01 15:54:40 adam Exp $ --- mysys/stacktrace.c.orig 2011-03-31 13:36:16.000000000 +0000 +++ mysys/stacktrace.c -@@ -421,7 +421,7 @@ void my_write_core(int sig) +@@ -431,7 +431,7 @@ void my_write_core(int sig) __gcov_flush(); #endif pthread_kill(pthread_self(), sig); diff --git a/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh b/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh index 9f6a5bab5d7..d57bf56ee13 100644 --- a/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh +++ b/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh @@ -1,8 +1,8 @@ -$NetBSD: patch-scripts_mysqld_safe.sh,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-scripts_mysqld_safe.sh,v 1.2 2012/10/01 15:54:40 adam Exp $ --- scripts/mysqld_safe.sh.orig 2011-03-31 13:36:18.000000000 +0000 +++ scripts/mysqld_safe.sh -@@ -715,7 +715,7 @@ fi +@@ -718,7 +718,7 @@ fi # Alternatively, you can start mysqld with the "myisam-recover" option. See # the manual for details. # diff --git a/databases/mysql55-client/patches/patch-sql_CMakeLists.txt b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt index 2207c0ae296..18ac366cf33 100644 --- a/databases/mysql55-client/patches/patch-sql_CMakeLists.txt +++ b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-sql_CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-sql_CMakeLists.txt,v 1.2 2012/10/01 15:54:40 adam Exp $ Do not install files in MYSQL_DATADIR. --- sql/CMakeLists.txt.orig 2011-04-25 19:03:50.000000000 +0000 +++ sql/CMakeLists.txt -@@ -243,7 +243,7 @@ ADD_CUSTOM_TARGET(distclean +@@ -259,7 +259,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) diff --git a/databases/mysql55-client/patches/patch-sql_log_event.cc b/databases/mysql55-client/patches/patch-sql_log_event.cc index e07424187d1..50cff2c2e64 100644 --- a/databases/mysql55-client/patches/patch-sql_log_event.cc +++ b/databases/mysql55-client/patches/patch-sql_log_event.cc @@ -1,10 +1,10 @@ -$NetBSD: patch-sql_log_event.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-sql_log_event.cc,v 1.2 2012/10/01 15:54:40 adam Exp $ * Portability: include <bstring.h> if exists. --- sql/log_event.cc.orig 2011-03-09 15:11:38.000000000 +0000 +++ sql/log_event.cc -@@ -44,6 +44,9 @@ +@@ -45,6 +45,9 @@ #include "rpl_record.h" #include "transaction.h" #include <my_dir.h> diff --git a/databases/mysql55-client/patches/patch-sql_mysqld.cc b/databases/mysql55-client/patches/patch-sql_mysqld.cc index 91fd944ed77..47bee5063df 100644 --- a/databases/mysql55-client/patches/patch-sql_mysqld.cc +++ b/databases/mysql55-client/patches/patch-sql_mysqld.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-sql_mysqld.cc,v 1.2 2011/07/08 09:32:07 adam Exp $ +$NetBSD: patch-sql_mysqld.cc,v 1.3 2012/10/01 15:54:40 adam Exp $ --- sql/mysqld.cc.orig 2011-06-21 16:42:40.000000000 +0000 +++ sql/mysqld.cc -@@ -163,7 +163,7 @@ extern int memcntl(caddr_t, size_t, int, +@@ -160,7 +160,7 @@ extern int memcntl(caddr_t, size_t, int, int initgroups(const char *,unsigned int); #endif @@ -11,7 +11,7 @@ $NetBSD: patch-sql_mysqld.cc,v 1.2 2011/07/08 09:32:07 adam Exp $ #include <ieeefp.h> #ifdef HAVE_FP_EXCEPT // Fix type conflict typedef fp_except fp_except_t; -@@ -194,7 +194,7 @@ extern "C" my_bool reopen_fstreams(const +@@ -191,7 +191,7 @@ extern "C" my_bool reopen_fstreams(const inline void setup_fpu() { |