diff options
12 files changed, 48 insertions, 46 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index b477275516f..30b3d5c5d0f 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.21 2012/08/03 13:46:49 adam Exp $ +# $NetBSD: Makefile.common,v 1.22 2012/10/01 15:54:40 adam Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile -DISTNAME= mysql-5.5.27 +DISTNAME= mysql-5.5.28 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo index dfe75fa3d19..855eb87ff8e 100644 --- a/databases/mysql55-client/distinfo +++ b/databases/mysql55-client/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.18 2012/08/03 13:46:49 adam Exp $ +$NetBSD: distinfo,v 1.19 2012/10/01 15:54:40 adam Exp $ -SHA1 (mysql-5.5.27.tar.gz) = d53dfbe4ac1119e4c4a33d639f2904abdd0f226d -RMD160 (mysql-5.5.27.tar.gz) = cd4b94a95c7639f96870c802b9b334d9e705b9a2 -Size (mysql-5.5.27.tar.gz) = 24667156 bytes +SHA1 (mysql-5.5.28.tar.gz) = 7b029e61db68866eeea0bec40d47fcdced30dd36 +RMD160 (mysql-5.5.28.tar.gz) = dbd2a75a2b55e54f5216d0ea1376b97fd7a107de +Size (mysql-5.5.28.tar.gz) = 24739429 bytes SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 -SHA1 (patch-CMakeLists.txt) = 5e990e40e1e8a5d558315a38b6596c8fa4227e7b +SHA1 (patch-CMakeLists.txt) = fc3d3854090ac19dec28ed03b41d78069304f23d SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb -SHA1 (patch-client_mysqladmin.cc) = 901c2b675cff7589ab629e591dabf26d17e4d8a7 -SHA1 (patch-client_mysqlbinlog.cc) = f78dd6538b978e1ae95bb720e8baa91087ecc149 -SHA1 (patch-client_sql_string.cc) = 4a18442fa16ccbc8f34c11a460209209017c3bc5 +SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 +SHA1 (patch-client_mysqlbinlog.cc) = 53258276d8fd713d2772c9c8c339bfe190b703cc +SHA1 (patch-client_sql_string.cc) = a798cc083b897c8e76bc590a886c15698a5266fd SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 @@ -16,13 +16,13 @@ SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 -SHA1 (patch-mysys_stacktrace.c) = c7633ab86f02e345e95564536882e09a9ef19f8d +SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 -SHA1 (patch-scripts_mysqld_safe.sh) = 74879fe38b74e3a51db1dd1233b29a05e9edad28 -SHA1 (patch-sql_CMakeLists.txt) = 9ad00a281976d5e96a95e17ba7387a8835b43e55 -SHA1 (patch-sql_log_event.cc) = e8d0dd7dc876b0e386be138cd5f569b4af8eca8a +SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 +SHA1 (patch-sql_CMakeLists.txt) = 6cf54ba886f220c8fe7675a0a3acc83257b9f596 +SHA1 (patch-sql_log_event.cc) = 1c4088b367fc300c669d763a1124d8eed4202e18 SHA1 (patch-sql_log_event.h) = eb9e38bbf50914ee504501b0723b57f80849ef48 -SHA1 (patch-sql_mysqld.cc) = b5ce7c3fb2dffa72df816ec2c34d26eb10dbcb09 +SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c SHA1 (patch-sql_sql_string.cc) = 00368733072803d59473410badb82e92673de0a7 SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be 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() { diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST index 26e8877ae93..9ece5196735 100644 --- a/databases/mysql55-server/PLIST +++ b/databases/mysql55-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2012/08/03 13:46:49 adam Exp $ +@comment $NetBSD: PLIST,v 1.19 2012/10/01 15:54:40 adam Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -2521,7 +2521,6 @@ share/mysql/test/suite/engines/rr_trx/t/rr_u_10-19.test share/mysql/test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test share/mysql/test/suite/engines/rr_trx/t/rr_u_4.test share/mysql/test/suite/federated/disabled.def -share/mysql/test/suite/federated/federated.inc share/mysql/test/suite/federated/federated.result share/mysql/test/suite/federated/federated.test share/mysql/test/suite/federated/federated_archive.result @@ -2532,7 +2531,6 @@ share/mysql/test/suite/federated/federated_bug_25714.result share/mysql/test/suite/federated/federated_bug_25714.test share/mysql/test/suite/federated/federated_bug_35333.result share/mysql/test/suite/federated/federated_bug_35333.test -share/mysql/test/suite/federated/federated_cleanup.inc share/mysql/test/suite/federated/federated_debug-master.opt share/mysql/test/suite/federated/federated_debug.result share/mysql/test/suite/federated/federated_debug.test @@ -2547,7 +2545,9 @@ share/mysql/test/suite/federated/federated_server.test share/mysql/test/suite/federated/federated_transactions-slave.opt share/mysql/test/suite/federated/federated_transactions.result share/mysql/test/suite/federated/federated_transactions.test -share/mysql/test/suite/federated/have_federated_db.inc +share/mysql/test/suite/federated/include/federated.inc +share/mysql/test/suite/federated/include/federated_cleanup.inc +share/mysql/test/suite/federated/include/have_federated_db.inc share/mysql/test/suite/federated/my.cnf share/mysql/test/suite/funcs_1/README.txt share/mysql/test/suite/funcs_1/bitdata/bitdata_master.test @@ -2976,6 +2976,7 @@ share/mysql/test/suite/innodb/r/innodb_file_format.result share/mysql/test/suite/innodb/r/innodb_gis.result share/mysql/test/suite/innodb/r/innodb_index_large_prefix.result share/mysql/test/suite/innodb/r/innodb_information_schema.result +share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result share/mysql/test/suite/innodb/r/innodb_misc1.result share/mysql/test/suite/innodb/r/innodb_multi_update.result @@ -3098,6 +3099,7 @@ share/mysql/test/suite/innodb/t/innodb_file_format.test share/mysql/test/suite/innodb/t/innodb_gis.test share/mysql/test/suite/innodb/t/innodb_index_large_prefix.test share/mysql/test/suite/innodb/t/innodb_information_schema.test +share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.test share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test share/mysql/test/suite/innodb/t/innodb_misc1-master.opt |