diff options
Diffstat (limited to 'databases/mysql56-server')
| -rw-r--r-- | databases/mysql56-server/Makefile | 11 | ||||
| -rw-r--r-- | databases/mysql56-server/PLIST | 46 |
2 files changed, 54 insertions, 3 deletions
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 0b9ea84b4b6..019b27dae3f 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/06/14 10:22:27 wiedi Exp $ +# $NetBSD: Makefile,v 1.17 2014/08/10 15:11:57 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -68,6 +68,15 @@ REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl REPLACE_PERL+= mysql-test/suite/rpl/extension/bhs.pl REPLACE_PERL+= mysql-test/suite/rpl/extension/checksum.pl +REPLACE_SH+= mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh +REPLACE_SH+= mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh +REPLACE_SH+= mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh +REPLACE_SH+= mysql-test/t/long_tmpdir-master.sh +REPLACE_SH+= mysql-test/t/lowercase_mixed_tmpdir-master.sh +REPLACE_SH+= mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh + +CHECK_INTERPRETER_SKIP+=share/mysql/test/std_data/dtrace.d + # Replace interpreter without pulling in Python dependecy # Update when PYTHON_VERSION_DEFAULT changes! SUBST_CLASSES+= python diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST index 3b8856a9977..babbc2f4845 100644 --- a/databases/mysql56-server/PLIST +++ b/databases/mysql56-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2014/06/02 07:30:38 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/08/10 15:11:57 adam Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -200,6 +200,7 @@ share/mysql/test/extra/binlog_tests/binlog_cache_stat.test share/mysql/test/extra/binlog_tests/binlog_implicit_commit.inc share/mysql/test/extra/binlog_tests/binlog_innodb.inc share/mysql/test/extra/binlog_tests/binlog_insert_delayed.test +share/mysql/test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc share/mysql/test/extra/binlog_tests/binlog_mysqlbinlog_row.inc share/mysql/test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc share/mysql/test/extra/binlog_tests/binlog_truncate.test @@ -251,6 +252,7 @@ share/mysql/test/extra/rpl_tests/rpl_filters.test share/mysql/test/extra/rpl_tests/rpl_flsh_tbls.test share/mysql/test/extra/rpl_tests/rpl_foreign_key.test share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test +share/mysql/test/extra/rpl_tests/rpl_gtid_drop_table.inc share/mysql/test/extra/rpl_tests/rpl_heartbeat_2slaves.inc share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc @@ -411,6 +413,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_ndb_epochs.inc share/mysql/test/include/get_relay_log_pos.inc share/mysql/test/include/gis_debug.inc share/mysql/test/include/gis_generic.inc @@ -731,7 +734,7 @@ share/mysql/test/include/view_alias.inc share/mysql/test/include/wait_condition.inc share/mysql/test/include/wait_condition_sp.inc share/mysql/test/include/wait_for_binlog_event.inc -share/mysql/test/include/wait_for_ndb_to_binlog.inc +share/mysql/test/include/wait_for_ndb_committed_to_binlog.inc share/mysql/test/include/wait_for_query_to_fail.inc share/mysql/test/include/wait_for_query_to_succeed.inc share/mysql/test/include/wait_for_slave_io_error.inc @@ -852,6 +855,7 @@ share/mysql/test/r/bool.result share/mysql/test/r/bootstrap.result share/mysql/test/r/bug12427262.result share/mysql/test/r/bug12969156.result +share/mysql/test/r/bug17076131.result share/mysql/test/r/bug33509.result share/mysql/test/r/bug39022.result share/mysql/test/r/bug46080.result @@ -960,6 +964,7 @@ share/mysql/test/r/drop-no_root.result share/mysql/test/r/drop.result share/mysql/test/r/drop_debug.result share/mysql/test/r/ds_mrr-big.result +share/mysql/test/r/dynamic_tracing.result share/mysql/test/r/empty_table.result share/mysql/test/r/endspace.result share/mysql/test/r/eq_range_idx_stat.result @@ -1283,6 +1288,7 @@ share/mysql/test/r/mysql_upgrade.result share/mysql/test/r/mysql_upgrade_ssl.result share/mysql/test/r/mysqladmin.result share/mysql/test/r/mysqlbinlog.result +share/mysql/test/r/mysqlbinlog_debug.result share/mysql/test/r/mysqlbinlog_raw_mode.result share/mysql/test/r/mysqlbinlog_raw_mode_win.result share/mysql/test/r/mysqlbinlog_row_big.result @@ -1472,6 +1478,7 @@ share/mysql/test/r/server_uuid.result share/mysql/test/r/server_uuid_embedded.result share/mysql/test/r/shm.result share/mysql/test/r/show_check.result +share/mysql/test/r/show_processlist.result share/mysql/test/r/show_profile.result share/mysql/test/r/signal.result share/mysql/test/r/signal_code.result @@ -1678,6 +1685,9 @@ share/mysql/test/std_data/binlog_savepoint.000001 share/mysql/test/std_data/binlog_transaction.000001 share/mysql/test/std_data/bug15328.cnf share/mysql/test/std_data/bug16266.000001 +share/mysql/test/std_data/bug17532932.MYD +share/mysql/test/std_data/bug17532932.MYI +share/mysql/test/std_data/bug17532932.frm share/mysql/test/std_data/bug19371.MYD share/mysql/test/std_data/bug19371.MYI share/mysql/test/std_data/bug19371.frm @@ -1729,6 +1739,7 @@ share/mysql/test/std_data/crl-server-cert.pem share/mysql/test/std_data/crl-server-key.pem share/mysql/test/std_data/crldir/ab8a3803.r0 share/mysql/test/std_data/des_key_file +share/mysql/test/std_data/dtrace.d share/mysql/test/std_data/funcs_1/innodb_tb1.txt share/mysql/test/std_data/funcs_1/innodb_tb2.txt share/mysql/test/std_data/funcs_1/innodb_tb3.txt @@ -1801,6 +1812,7 @@ share/mysql/test/std_data/server-key-sha512.pem share/mysql/test/std_data/server-key.pem share/mysql/test/std_data/server8k-cert.pem share/mysql/test/std_data/server8k-key.pem +share/mysql/test/std_data/system_tap.stp share/mysql/test/std_data/trunc_binlog.000001 share/mysql/test/std_data/untrusted-cacert.pem share/mysql/test/std_data/vchar.frm @@ -1904,6 +1916,7 @@ share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result +share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result share/mysql/test/suite/binlog/r/binlog_old_versions.result share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result share/mysql/test/suite/binlog/r/binlog_reset_master.result @@ -1951,6 +1964,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/binlogging_impossible.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 @@ -2016,6 +2030,7 @@ share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test +share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test share/mysql/test/suite/binlog/t/binlog_old_versions.test share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test @@ -2078,6 +2093,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/binlogging_impossible.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 @@ -3375,6 +3391,7 @@ share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc share/mysql/test/suite/innodb/r/blob-update-debug.result share/mysql/test/suite/innodb/r/create-index.result +share/mysql/test/suite/innodb/r/foreign_key.result share/mysql/test/suite/innodb/r/innodb-2byte-collation.result share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result @@ -3432,6 +3449,7 @@ share/mysql/test/suite/innodb/r/innodb-wl6445-2.result share/mysql/test/suite/innodb/r/innodb-wl6445.result share/mysql/test/suite/innodb/r/innodb.result share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result +share/mysql/test/suite/innodb/r/innodb_blob_unrecoverable_crash.result share/mysql/test/suite/innodb/r/innodb_buffer_pool_load.result share/mysql/test/suite/innodb/r/innodb_bug-13628249.result share/mysql/test/suite/innodb/r/innodb_bug11754376.result @@ -3543,6 +3561,7 @@ share/mysql/test/suite/innodb/r/innodb_ut_format_name.result share/mysql/test/suite/innodb/t/blob-update-debug.test share/mysql/test/suite/innodb/t/create-index.test share/mysql/test/suite/innodb/t/disabled.def +share/mysql/test/suite/innodb/t/foreign_key.test share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt share/mysql/test/suite/innodb/t/innodb-2byte-collation.test share/mysql/test/suite/innodb/t/innodb-ac-non-locking-select.test @@ -3612,6 +3631,7 @@ share/mysql/test/suite/innodb/t/innodb-wl6445.test share/mysql/test/suite/innodb/t/innodb.test share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test +share/mysql/test/suite/innodb/t/innodb_blob_unrecoverable_crash.test share/mysql/test/suite/innodb/t/innodb_buffer_pool_load-master.opt share/mysql/test/suite/innodb/t/innodb_buffer_pool_load.test share/mysql/test/suite/innodb/t/innodb_bug-13628249.test @@ -6004,6 +6024,7 @@ share/mysql/test/suite/rpl/r/rpl_000010.result share/mysql/test/suite/rpl/r/rpl_000011.result share/mysql/test/suite/rpl/r/rpl_000013.result share/mysql/test/suite/rpl/r/rpl_000017.result +share/mysql/test/suite/rpl/r/rpl_4threads_deadlock.result share/mysql/test/suite/rpl/r/rpl_DML_error.result share/mysql/test/suite/rpl/r/rpl_EE_err.result share/mysql/test/suite/rpl/r/rpl_LD_INFILE.result @@ -6095,6 +6116,7 @@ share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result share/mysql/test/suite/rpl/r/rpl_gtid_binlog_errors.result share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result +share/mysql/test/suite/rpl/r/rpl_gtid_drop_table.result share/mysql/test/suite/rpl/r/rpl_gtid_empty_transaction.result share/mysql/test/suite/rpl/r/rpl_gtid_execution.result share/mysql/test/suite/rpl/r/rpl_gtid_failover.result @@ -6136,6 +6158,7 @@ share/mysql/test/suite/rpl/r/rpl_insert.result share/mysql/test/suite/rpl/r/rpl_insert_id.result share/mysql/test/suite/rpl/r/rpl_insert_id_pk.result share/mysql/test/suite/rpl/r/rpl_insert_ignore.result +share/mysql/test/suite/rpl/r/rpl_insert_on_update.result share/mysql/test/suite/rpl/r/rpl_invoked_features.result share/mysql/test/suite/rpl/r/rpl_ip_mix.result share/mysql/test/suite/rpl/r/rpl_ip_mix2.result @@ -6206,6 +6229,7 @@ share/mysql/test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result share/mysql/test/suite/rpl/r/rpl_parallel_start_stop.result share/mysql/test/suite/rpl/r/rpl_parallel_switch_sequential.result share/mysql/test/suite/rpl/r/rpl_parallel_temp_query.result +share/mysql/test/suite/rpl/r/rpl_parallel_worker_error.result share/mysql/test/suite/rpl/r/rpl_partition_archive.result share/mysql/test/suite/rpl/r/rpl_partition_innodb.result share/mysql/test/suite/rpl/r/rpl_partition_memory.result @@ -6326,6 +6350,7 @@ share/mysql/test/suite/rpl/r/rpl_semi_sync_deadlock.result share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result share/mysql/test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result share/mysql/test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result +share/mysql/test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result share/mysql/test/suite/rpl/r/rpl_sequential.result share/mysql/test/suite/rpl/r/rpl_server_id1.result share/mysql/test/suite/rpl/r/rpl_server_id2.result @@ -6400,6 +6425,7 @@ share/mysql/test/suite/rpl/r/rpl_temporal_fractional.result share/mysql/test/suite/rpl/r/rpl_temporary.result share/mysql/test/suite/rpl/r/rpl_temporary_errors.result share/mysql/test/suite/rpl/r/rpl_test_framework.result +share/mysql/test/suite/rpl/r/rpl_timestamp_upgrage_55.result share/mysql/test/suite/rpl/r/rpl_timezone.result share/mysql/test/suite/rpl/r/rpl_tmp_table_and_DDL.result share/mysql/test/suite/rpl/r/rpl_trigger.result @@ -6422,6 +6448,7 @@ share/mysql/test/suite/rpl/t/rpl_000010.test share/mysql/test/suite/rpl/t/rpl_000011.test share/mysql/test/suite/rpl/t/rpl_000013.test share/mysql/test/suite/rpl/t/rpl_000017.test +share/mysql/test/suite/rpl/t/rpl_4threads_deadlock.test share/mysql/test/suite/rpl/t/rpl_DML_error.test share/mysql/test/suite/rpl/t/rpl_EE_err.test share/mysql/test/suite/rpl/t/rpl_LD_INFILE.test @@ -6558,6 +6585,8 @@ share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-master.opt share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-slave.opt share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive.test +share/mysql/test/suite/rpl/t/rpl_gtid_drop_table.cnf +share/mysql/test/suite/rpl/t/rpl_gtid_drop_table.test share/mysql/test/suite/rpl/t/rpl_gtid_empty_transaction.cnf share/mysql/test/suite/rpl/t/rpl_gtid_empty_transaction.test share/mysql/test/suite/rpl/t/rpl_gtid_execution-master.opt @@ -6634,6 +6663,7 @@ share/mysql/test/suite/rpl/t/rpl_insert_id-slave.opt share/mysql/test/suite/rpl/t/rpl_insert_id.test share/mysql/test/suite/rpl/t/rpl_insert_id_pk.test share/mysql/test/suite/rpl/t/rpl_insert_ignore.test +share/mysql/test/suite/rpl/t/rpl_insert_on_update.test share/mysql/test/suite/rpl/t/rpl_invoked_features-master.opt share/mysql/test/suite/rpl/t/rpl_invoked_features.test share/mysql/test/suite/rpl/t/rpl_ip_mix-master.opt @@ -6751,6 +6781,7 @@ share/mysql/test/suite/rpl/t/rpl_parallel_switch_sequential-slave.opt share/mysql/test/suite/rpl/t/rpl_parallel_switch_sequential.test share/mysql/test/suite/rpl/t/rpl_parallel_temp_query-slave.opt share/mysql/test/suite/rpl/t/rpl_parallel_temp_query.test +share/mysql/test/suite/rpl/t/rpl_parallel_worker_error.test share/mysql/test/suite/rpl/t/rpl_partition_archive.test share/mysql/test/suite/rpl/t/rpl_partition_innodb-master.opt share/mysql/test/suite/rpl/t/rpl_partition_innodb.test @@ -6922,6 +6953,9 @@ share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-master.opt share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test +share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt +share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt +share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test share/mysql/test/suite/rpl/t/rpl_sequential-master.opt share/mysql/test/suite/rpl/t/rpl_sequential-slave.opt share/mysql/test/suite/rpl/t/rpl_sequential.test @@ -7036,6 +7070,7 @@ share/mysql/test/suite/rpl/t/rpl_temporary_errors-slave.opt share/mysql/test/suite/rpl/t/rpl_temporary_errors.test share/mysql/test/suite/rpl/t/rpl_test_framework.cnf share/mysql/test/suite/rpl/t/rpl_test_framework.test +share/mysql/test/suite/rpl/t/rpl_timestamp_upgrage_55.test share/mysql/test/suite/rpl/t/rpl_timezone-master.opt share/mysql/test/suite/rpl/t/rpl_timezone-slave.opt share/mysql/test/suite/rpl/t/rpl_timezone.test @@ -7191,6 +7226,7 @@ share/mysql/test/suite/sys_vars/r/binlog_row_image_basic.result share/mysql/test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result +share/mysql/test/suite/sys_vars/r/binlogging_impossible_mode_basic.result share/mysql/test/suite/sys_vars/r/block_encryption_mode_basic.result share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result @@ -7785,6 +7821,7 @@ share/mysql/test/suite/sys_vars/t/binlog_row_image_basic.test share/mysql/test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test +share/mysql/test/suite/sys_vars/t/binlogging_impossible_mode_basic.test share/mysql/test/suite/sys_vars/t/block_encryption_mode_basic.test share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test @@ -8452,6 +8489,8 @@ share/mysql/test/t/bootstrap.test share/mysql/test/t/bug12427262.test share/mysql/test/t/bug12969156-master.opt share/mysql/test/t/bug12969156.test +share/mysql/test/t/bug17076131-master.opt +share/mysql/test/t/bug17076131.test share/mysql/test/t/bug33509-master.opt share/mysql/test/t/bug33509.test share/mysql/test/t/bug39022.test @@ -8581,6 +8620,7 @@ share/mysql/test/t/drop-no_root.test share/mysql/test/t/drop.test share/mysql/test/t/drop_debug.test share/mysql/test/t/ds_mrr-big.test +share/mysql/test/t/dynamic_tracing.test share/mysql/test/t/empty_table.test share/mysql/test/t/endspace.test share/mysql/test/t/eq_range_idx_stat.test @@ -8920,6 +8960,7 @@ share/mysql/test/t/mysql_upgrade_ssl.test share/mysql/test/t/mysqladmin.test share/mysql/test/t/mysqlbinlog-master.opt share/mysql/test/t/mysqlbinlog.test +share/mysql/test/t/mysqlbinlog_debug.test share/mysql/test/t/mysqlbinlog_raw_mode.test share/mysql/test/t/mysqlbinlog_raw_mode_win.test share/mysql/test/t/mysqlbinlog_row_big.test @@ -9133,6 +9174,7 @@ share/mysql/test/t/shm-master.opt share/mysql/test/t/shm.test share/mysql/test/t/show_check-master.opt share/mysql/test/t/show_check.test +share/mysql/test/t/show_processlist.test share/mysql/test/t/show_profile.test share/mysql/test/t/signal.test share/mysql/test/t/signal_code.test |