diff options
| -rw-r--r-- | databases/mysql56-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql56-client/distinfo | 14 | ||||
| -rw-r--r-- | databases/mysql56-client/options.mk | 5 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql56-server/PLIST | 31 |
5 files changed, 39 insertions, 18 deletions
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common index 3196e071de0..d3e7fe6bf4b 100644 --- a/databases/mysql56-client/Makefile.common +++ b/databases/mysql56-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.20 2014/12/02 12:40:09 adam Exp $ +# $NetBSD: Makefile.common,v 1.21 2015/02/07 19:23:40 adam Exp $ # # used by databases/mysql56-client/Makefile # used by databases/mysql56-server/Makefile -DISTNAME= mysql-5.6.22 +DISTNAME= mysql-5.6.23 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo index 91e0decc57f..31a8ee3f950 100644 --- a/databases/mysql56-client/distinfo +++ b/databases/mysql56-client/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.20 2015/01/03 16:07:38 fhajny Exp $ +$NetBSD: distinfo,v 1.21 2015/02/07 19:23:40 adam Exp $ -SHA1 (mysql-5.6.22.tar.gz) = 31ac6f799dd76950b4de9979320129ac04fb38e1 -RMD160 (mysql-5.6.22.tar.gz) = 64ad57c080454cf52ff097251b9684a68ed00804 -Size (mysql-5.6.22.tar.gz) = 33115516 bytes -SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e -RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530 -Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes +SHA1 (mysql-5.6.23.tar.gz) = 2d610ba01ab97df042d5946ba0da411da5547c5d +RMD160 (mysql-5.6.23.tar.gz) = 90e1b18264493434d986f39962d249c176b8469a +Size (mysql-5.6.23.tar.gz) = 33115859 bytes +SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a +RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a +Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk index 3373429109b..77d61f5361d 100644 --- a/databases/mysql56-client/options.mk +++ b/databases/mysql56-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2015/02/07 16:04:46 fhajny Exp $ +# $NetBSD: options.mk,v 1.7 2015/02/07 19:23:40 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 @@ -25,8 +25,9 @@ CMAKE_ARGS+= -DENABLE_DTRACE=ON # http://sphinxsearch.com/docs/current.html#sphinxse-overview PLIST_VARS+= sphinx .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi) -SPHINX_VER= 2.2.5 +SPHINX_VER= 2.2.7 DISTFILES= ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX} +SITES.sphinx-2.2.7-release.tar.gz= http://sphinxsearch.com/files/ .if !empty(PKGPATH:Mdatabases/mysql56-server) MESSAGE_SRC= ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx .endif diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index dc699509482..0bbc1bb7633 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2015/02/07 16:04:47 fhajny Exp $ +# $NetBSD: Makefile,v 1.22 2015/02/07 19:23:40 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 COMMENT= MySQL 5, a free SQL database (server) CONFLICTS= mysql3-server-[0-9]* diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST index 1c4d87c5b7e..a38693fee6d 100644 --- a/databases/mysql56-server/PLIST +++ b/databases/mysql56-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2014/12/02 12:40:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2015/02/07 19:23:40 adam Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -416,6 +416,7 @@ share/mysql/test/include/func_aes_block.inc share/mysql/test/include/func_in.inc share/mysql/test/include/function_defaults.inc share/mysql/test/include/function_defaults_notembedded.inc +share/mysql/test/include/get_file_permissions.inc share/mysql/test/include/get_ndb_epochs.inc share/mysql/test/include/get_relay_log_pos.inc share/mysql/test/include/gis_debug.inc @@ -1608,6 +1609,7 @@ share/mysql/test/r/table_definition_cache_functionality.result share/mysql/test/r/table_open_cache_functionality.result share/mysql/test/r/tablelock.result share/mysql/test/r/tablespace.result +share/mysql/test/r/temp_pool.result share/mysql/test/r/temp_table.result share/mysql/test/r/temporal_literal.result share/mysql/test/r/testdb_only.require @@ -1904,6 +1906,7 @@ share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result share/mysql/test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result +share/mysql/test/suite/binlog/r/binlog_gtid_simple_recovery.result share/mysql/test/suite/binlog/r/binlog_gtid_stm_ctype_ucs.result share/mysql/test/suite/binlog/r/binlog_gtid_utils.result share/mysql/test/suite/binlog/r/binlog_hexdump.result @@ -1947,7 +1950,6 @@ share/mysql/test/suite/binlog/r/binlog_row_query_log_events.result share/mysql/test/suite/binlog/r/binlog_server_id.result share/mysql/test/suite/binlog/r/binlog_server_start_options.result share/mysql/test/suite/binlog/r/binlog_sf.result -share/mysql/test/suite/binlog/r/binlog_simplified_binlog_gtid_recovery.result share/mysql/test/suite/binlog/r/binlog_spurious_ddl_errors.result share/mysql/test/suite/binlog/r/binlog_sql_mode.result share/mysql/test/suite/binlog/r/binlog_start_comment.result @@ -1977,6 +1979,7 @@ share/mysql/test/suite/binlog/r/binlog_variables_log_bin_index.result share/mysql/test/suite/binlog/r/binlog_variables_relay_log.result share/mysql/test/suite/binlog/r/binlog_variables_relay_log_index.result share/mysql/test/suite/binlog/r/binlog_write_error.result +share/mysql/test/suite/binlog/r/binlog_xa_handling.result share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001 share/mysql/test/suite/binlog/std_data/bug11747887-bin.000003 share/mysql/test/suite/binlog/std_data/bug32407.001 @@ -2015,6 +2018,7 @@ share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_innodb.test share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_myisam.test share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_start_stop.test share/mysql/test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test +share/mysql/test/suite/binlog/t/binlog_gtid_simple_recovery.test share/mysql/test/suite/binlog/t/binlog_gtid_stm_ctype_ucs.test share/mysql/test/suite/binlog/t/binlog_gtid_utils.test share/mysql/test/suite/binlog/t/binlog_hexdump.test @@ -2068,7 +2072,6 @@ share/mysql/test/suite/binlog/t/binlog_server_id.test share/mysql/test/suite/binlog/t/binlog_server_start_options.test share/mysql/test/suite/binlog/t/binlog_sf.test share/mysql/test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt -share/mysql/test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery.test share/mysql/test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt share/mysql/test/suite/binlog/t/binlog_spurious_ddl_errors.test share/mysql/test/suite/binlog/t/binlog_sql_mode.test @@ -2109,6 +2112,7 @@ share/mysql/test/suite/binlog/t/binlog_variables_relay_log.test share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index-master.opt share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index.test share/mysql/test/suite/binlog/t/binlog_write_error.test +share/mysql/test/suite/binlog/t/binlog_xa_handling.test share/mysql/test/suite/binlog/t/disabled.def share/mysql/test/suite/engines/README share/mysql/test/suite/engines/funcs/r/ai_init_alter_table.result @@ -3548,7 +3552,6 @@ share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.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_monitor.result share/mysql/test/suite/innodb/r/innodb_multi_update.result share/mysql/test/suite/innodb/r/innodb_mysql.result share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result @@ -3580,6 +3583,8 @@ share/mysql/test/suite/innodb/r/innodb_trx_weight.result share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result share/mysql/test/suite/innodb/r/innodb_ut_format_name.result share/mysql/test/suite/innodb/r/insert_debug.result +share/mysql/test/suite/innodb/r/monitor.result +share/mysql/test/suite/innodb/r/monitor_debug.result share/mysql/test/suite/innodb/r/sp_temp_table.result share/mysql/test/suite/innodb/r/strict_mode.result share/mysql/test/suite/innodb/t/add_foreign_key.test @@ -3756,7 +3761,6 @@ 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 share/mysql/test/suite/innodb/t/innodb_misc1.test -share/mysql/test/suite/innodb/t/innodb_monitor.test share/mysql/test/suite/innodb/t/innodb_multi_update.test share/mysql/test/suite/innodb/t/innodb_mysql-master.opt share/mysql/test/suite/innodb/t/innodb_mysql.test @@ -3793,6 +3797,8 @@ share/mysql/test/suite/innodb/t/innodb_trx_weight.test share/mysql/test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test share/mysql/test/suite/innodb/t/innodb_ut_format_name.test share/mysql/test/suite/innodb/t/insert_debug.test +share/mysql/test/suite/innodb/t/monitor.test +share/mysql/test/suite/innodb/t/monitor_debug.test share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip share/mysql/test/suite/innodb/t/sp_temp_table.test @@ -3828,6 +3834,7 @@ share/mysql/test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result share/mysql/test/suite/innodb_fts/r/innodb_fts_savepoint.result share/mysql/test/suite/innodb_fts/r/innodb_fts_stopword_charset.result share/mysql/test/suite/innodb_fts/r/innodb_fts_transaction.result +share/mysql/test/suite/innodb_fts/r/subexpr.result share/mysql/test/suite/innodb_fts/t/disabled.def share/mysql/test/suite/innodb_fts/t/fts_compatibility.test share/mysql/test/suite/innodb_fts/t/fts_compatibility_win.test @@ -3861,6 +3868,7 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_result_cache_limit.test share/mysql/test/suite/innodb_fts/t/innodb_fts_savepoint.test share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test +share/mysql/test/suite/innodb_fts/t/subexpr.test share/mysql/test/suite/innodb_zip/include/innodb_create_tab_indx.inc share/mysql/test/suite/innodb_zip/include/innodb_fetch_records.inc share/mysql/test/suite/innodb_zip/include/innodb_load_data.inc @@ -6125,6 +6133,7 @@ share/mysql/test/suite/rpl/r/rpl_do_table_filter_insensitive.result share/mysql/test/suite/rpl/r/rpl_do_table_filter_sensitive.result share/mysql/test/suite/rpl/r/rpl_drop.result share/mysql/test/suite/rpl/r/rpl_drop_db.result +share/mysql/test/suite/rpl/r/rpl_drop_db_fail.result share/mysql/test/suite/rpl/r/rpl_drop_temp.result share/mysql/test/suite/rpl/r/rpl_drop_temp_gtid.result share/mysql/test/suite/rpl/r/rpl_drop_view.result @@ -6394,6 +6403,7 @@ share/mysql/test/suite/rpl/r/rpl_row_utf32.result share/mysql/test/suite/rpl/r/rpl_row_view01.result share/mysql/test/suite/rpl/r/rpl_row_wide_table.result share/mysql/test/suite/rpl/r/rpl_savepoint.result +share/mysql/test/suite/rpl/r/rpl_sbm_previous_gtid_event.result share/mysql/test/suite/rpl/r/rpl_seconds_behind_master.result share/mysql/test/suite/rpl/r/rpl_semi_sync.result share/mysql/test/suite/rpl/r/rpl_semi_sync_deadlock.result @@ -6416,6 +6426,7 @@ share/mysql/test/suite/rpl/r/rpl_show_errors.result share/mysql/test/suite/rpl/r/rpl_show_master_info_file.result share/mysql/test/suite/rpl/r/rpl_show_slave_hosts.result share/mysql/test/suite/rpl/r/rpl_show_slave_running.result +share/mysql/test/suite/rpl/r/rpl_show_slave_status_deadlock.result share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result share/mysql/test/suite/rpl/r/rpl_skip_error.result share/mysql/test/suite/rpl/r/rpl_skip_incident.result @@ -6489,6 +6500,7 @@ share/mysql/test/suite/rpl/r/rpl_truncate_3innodb.result share/mysql/test/suite/rpl/r/rpl_typeconv.result share/mysql/test/suite/rpl/r/rpl_typeconv_innodb.result share/mysql/test/suite/rpl/r/rpl_udf.result +share/mysql/test/suite/rpl/r/rpl_unknown_ignorable_event.result share/mysql/test/suite/rpl/r/rpl_user.result share/mysql/test/suite/rpl/r/rpl_user_variables.result share/mysql/test/suite/rpl/r/rpl_variables.result @@ -6589,6 +6601,7 @@ share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive.test share/mysql/test/suite/rpl/t/rpl_drop.test share/mysql/test/suite/rpl/t/rpl_drop_db.test +share/mysql/test/suite/rpl/t/rpl_drop_db_fail.test share/mysql/test/suite/rpl/t/rpl_drop_temp-slave.opt share/mysql/test/suite/rpl/t/rpl_drop_temp.test share/mysql/test/suite/rpl/t/rpl_drop_temp_gtid.test @@ -7008,6 +7021,8 @@ share/mysql/test/suite/rpl/t/rpl_row_utf32.test share/mysql/test/suite/rpl/t/rpl_row_view01.test share/mysql/test/suite/rpl/t/rpl_row_wide_table.test share/mysql/test/suite/rpl/t/rpl_savepoint.test +share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt +share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event.test share/mysql/test/suite/rpl/t/rpl_seconds_behind_master.test share/mysql/test/suite/rpl/t/rpl_semi_sync-master.opt share/mysql/test/suite/rpl/t/rpl_semi_sync-slave.opt @@ -7055,6 +7070,7 @@ share/mysql/test/suite/rpl/t/rpl_show_master_info_file.test share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.cnf share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test share/mysql/test/suite/rpl/t/rpl_show_slave_running.test +share/mysql/test/suite/rpl/t/rpl_show_slave_status_deadlock.test share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli.test share/mysql/test/suite/rpl/t/rpl_skip_error-slave.opt @@ -7166,6 +7182,7 @@ share/mysql/test/suite/rpl/t/rpl_typeconv_innodb.test share/mysql/test/suite/rpl/t/rpl_udf-master.opt share/mysql/test/suite/rpl/t/rpl_udf-slave.opt share/mysql/test/suite/rpl/t/rpl_udf.test +share/mysql/test/suite/rpl/t/rpl_unknown_ignorable_event.test share/mysql/test/suite/rpl/t/rpl_user.test share/mysql/test/suite/rpl/t/rpl_user_variables.test share/mysql/test/suite/rpl/t/rpl_variables.test @@ -7301,6 +7318,7 @@ share/mysql/test/suite/sys_vars/r/binlog_checksum_basic.result share/mysql/test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result share/mysql/test/suite/sys_vars/r/binlog_error_action_basic.result share/mysql/test/suite/sys_vars/r/binlog_format_basic.result +share/mysql/test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result share/mysql/test/suite/sys_vars/r/binlog_max_flush_queue_time_basic.result share/mysql/test/suite/sys_vars/r/binlog_order_commits_basic.result share/mysql/test/suite/sys_vars/r/binlog_row_image_basic.result @@ -7898,6 +7916,7 @@ share/mysql/test/suite/sys_vars/t/binlog_checksum_basic.test share/mysql/test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test share/mysql/test/suite/sys_vars/t/binlog_error_action_basic.test share/mysql/test/suite/sys_vars/t/binlog_format_basic.test +share/mysql/test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test share/mysql/test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test share/mysql/test/suite/sys_vars/t/binlog_order_commits_basic.test share/mysql/test/suite/sys_vars/t/binlog_row_image_basic.test @@ -9416,6 +9435,8 @@ share/mysql/test/t/table_definition_cache_functionality.test share/mysql/test/t/table_open_cache_functionality.test share/mysql/test/t/tablelock.test share/mysql/test/t/tablespace.test +share/mysql/test/t/temp_pool-master.opt +share/mysql/test/t/temp_pool.test share/mysql/test/t/temp_table-master.opt share/mysql/test/t/temp_table.test share/mysql/test/t/temporal_literal.test |