Changes 5.6.22:

* Noisy compiler warnings on FreeBSD 10 were silenced.
* CMake workarounds for older Mac OS X and XCode versions were removed. On Mac OS X, compilation always uses Clang, even for 32-bit builds.
* Previously, the MYSQL_MAINTAINER_MODE CMake option was turned on by default for debug builds and off for release builds, and MYSQL_MAINTAINER_MODE caused -Werror to be enabled when building with GCC. This made it cumbersome to enable -Werror under certain conditions, such as when compiling with Clang.
* Build support was modified to produce the same warnings for Clang as for gcc.
* CMake configuration for the Clang compiler sets more appropriate flags for building on Linux. Specifically, -g -fno-omit-frame-pointer -fno-strict-aliasing is now added.
* Bugs fixed.

3 files changed, 55 insertions, 12 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 9eb5742f59e..3196e071de0 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.19 2014/10/01 08:34:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2014/12/02 12:40:09 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.21
+DISTNAME=	mysql-5.6.22
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index e1b93073907..840e4590e98 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.18 2014/10/17 17:07:44 fhajny Exp $
+$NetBSD: distinfo,v 1.19 2014/12/02 12:40:09 adam Exp $
 
-SHA1 (mysql-5.6.21.tar.gz) = be068ba90953aecdb3f448b4ba1d35796eb799eb
-RMD160 (mysql-5.6.21.tar.gz) = 549b3476c3bbe6ca6b459b5970fc59a345334cd7
-Size (mysql-5.6.21.tar.gz) = 33009070 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.22.tar.gz) = 31ac6f799dd76950b4de9979320129ac04fb38e1
+RMD160 (mysql-5.6.22.tar.gz) = 64ad57c080454cf52ff097251b9684a68ed00804
+Size (mysql-5.6.22.tar.gz) = 33115516 bytes
 SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index e31d572edd1..1c4d87c5b7e 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2014/10/17 17:07:45 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/12/02 12:40:09 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -276,6 +276,7 @@ share/mysql/test/extra/rpl_tests/rpl_mixing_engines.inc
 share/mysql/test/extra/rpl_tests/rpl_mixing_engines.test
 share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc
 share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test
+share/mysql/test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
 share/mysql/test/extra/rpl_tests/rpl_multi_query.test
 share/mysql/test/extra/rpl_tests/rpl_multi_update.test
 share/mysql/test/extra/rpl_tests/rpl_multi_update2.test
@@ -523,6 +524,7 @@ share/mysql/test/include/have_utf16.inc
 share/mysql/test/include/have_utf32.inc
 share/mysql/test/include/have_utf8.inc
 share/mysql/test/include/have_utf8mb4.inc
+share/mysql/test/include/have_util_nc.inc
 share/mysql/test/include/have_valgrind.inc
 share/mysql/test/include/have_validate_password_plugin.inc
 share/mysql/test/include/ib_logfile_size_check.inc
@@ -1173,6 +1175,7 @@ share/mysql/test/r/innodb_mysql_lock2.result
 share/mysql/test/r/innodb_mysql_sync.result
 share/mysql/test/r/innodb_pk_extension_off.result
 share/mysql/test/r/innodb_pk_extension_on.result
+share/mysql/test/r/innodb_recovery_with_upper_case_names.result
 share/mysql/test/r/insert.result
 share/mysql/test/r/insert_notembedded.result
 share/mysql/test/r/insert_select.result
@@ -1295,6 +1298,7 @@ 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_mixed_or_statment.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
@@ -1888,6 +1892,7 @@ share/mysql/test/suite/binlog/r/binlog_database.result
 share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result
 share/mysql/test/suite/binlog/r/binlog_drop_if_exists.result
 share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency.result
+share/mysql/test/suite/binlog/r/binlog_error_action.result
 share/mysql/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 share/mysql/test/suite/binlog/r/binlog_grant.result
 share/mysql/test/suite/binlog/r/binlog_gtid_cache.result
@@ -1972,7 +1977,6 @@ 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
@@ -1997,6 +2001,7 @@ share/mysql/test/suite/binlog/t/binlog_database.test
 share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test
 share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency.test
+share/mysql/test/suite/binlog/t/binlog_error_action.test
 share/mysql/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 share/mysql/test/suite/binlog/t/binlog_grant.test
 share/mysql/test/suite/binlog/t/binlog_gtid_cache-master.opt
@@ -2104,7 +2109,6 @@ 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
@@ -3396,12 +3400,15 @@ share/mysql/test/suite/funcs_2/t/innodb_charset.test
 share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
+share/mysql/test/suite/innodb/include/checksum_not_strict.inc
 share/mysql/test/suite/innodb/include/innodb_dict.inc
 share/mysql/test/suite/innodb/include/innodb_stats.inc
 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/add_foreign_key.result
 share/mysql/test/suite/innodb/r/blob-update-debug.result
+share/mysql/test/suite/innodb/r/blob_redo.result
+share/mysql/test/suite/innodb/r/checksum.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/index_tree_operation.result
@@ -3572,8 +3579,14 @@ share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
 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/sp_temp_table.result
+share/mysql/test/suite/innodb/r/strict_mode.result
 share/mysql/test/suite/innodb/t/add_foreign_key.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
+share/mysql/test/suite/innodb/t/blob_redo-master.opt
+share/mysql/test/suite/innodb/t/blob_redo.test
+share/mysql/test/suite/innodb/t/checksum.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
@@ -3779,8 +3792,13 @@ share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 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/portability_wl5980_linux.zip
 share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
+share/mysql/test/suite/innodb/t/sp_temp_table.test
+share/mysql/test/suite/innodb/t/strict_mode.test
+share/mysql/test/suite/innodb_fts/r/fts_compatibility.result
+share/mysql/test/suite/innodb_fts/r/fts_compatibility_win.result
 share/mysql/test/suite/innodb_fts/r/fulltext.result
 share/mysql/test/suite/innodb_fts/r/fulltext2.result
 share/mysql/test/suite/innodb_fts/r/fulltext3.result
@@ -3811,6 +3829,8 @@ 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/t/disabled.def
+share/mysql/test/suite/innodb_fts/t/fts_compatibility.test
+share/mysql/test/suite/innodb_fts/t/fts_compatibility_win.test
 share/mysql/test/suite/innodb_fts/t/fulltext.test
 share/mysql/test/suite/innodb_fts/t/fulltext2.test
 share/mysql/test/suite/innodb_fts/t/fulltext3.test
@@ -5581,6 +5601,7 @@ share/mysql/test/suite/perfschema/r/threads_innodb.result
 share/mysql/test/suite/perfschema/r/threads_insert_delayed.result
 share/mysql/test/suite/perfschema/r/threads_mysql.result
 share/mysql/test/suite/perfschema/r/trigger_table_io.result
+share/mysql/test/suite/perfschema/r/unary_digest.result
 share/mysql/test/suite/perfschema/r/view_table_io.result
 share/mysql/test/suite/perfschema/t/aggregate.test
 share/mysql/test/suite/perfschema/t/all_tests.test
@@ -5997,6 +6018,7 @@ share/mysql/test/suite/perfschema/t/threads_insert_delayed.test
 share/mysql/test/suite/perfschema/t/threads_mysql-master.opt
 share/mysql/test/suite/perfschema/t/threads_mysql.test
 share/mysql/test/suite/perfschema/t/trigger_table_io.test
+share/mysql/test/suite/perfschema/t/unary_digest.test
 share/mysql/test/suite/perfschema/t/view_table_io.test
 share/mysql/test/suite/perfschema_stress/README
 share/mysql/test/suite/perfschema_stress/include/settings.inc
@@ -6131,6 +6153,7 @@ share/mysql/test/suite/rpl/r/rpl_get_master_version_and_clock.result
 share/mysql/test/suite/rpl/r/rpl_grant.result
 share/mysql/test/suite/rpl/r/rpl_grant_plugin.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
+share/mysql/test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.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
@@ -6153,6 +6176,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stress_failover.result
+share/mysql/test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
 share/mysql/test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result
 share/mysql/test/suite/rpl/r/rpl_heartbeat.result
 share/mysql/test/suite/rpl/r/rpl_heartbeat_2slaves.result
@@ -6216,7 +6240,10 @@ share/mysql/test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
 share/mysql/test/suite/rpl/r/rpl_mixed_mixing_engines.result
 share/mysql/test/suite/rpl/r/rpl_mixed_row_innodb.result
 share/mysql/test/suite/rpl/r/rpl_mts_debug.result
+share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
+share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
 share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
+share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete2.result
 share/mysql/test/suite/rpl/r/rpl_multi_engine.result
@@ -6259,6 +6286,8 @@ share/mysql/test/suite/rpl/r/rpl_ps.result
 share/mysql/test/suite/rpl/r/rpl_rbr_to_sbr.result
 share/mysql/test/suite/rpl/r/rpl_read_old_relay_log_info.result
 share/mysql/test/suite/rpl/r/rpl_read_only.result
+share/mysql/test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
+share/mysql/test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
 share/mysql/test/suite/rpl/r/rpl_relayrotate.result
@@ -6603,6 +6632,7 @@ share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin.test
 share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test
+share/mysql/test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test
 share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors.test
 share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
@@ -6646,6 +6676,7 @@ share/mysql/test/suite/rpl/t/rpl_gtid_stm_insert_delayed.test
 share/mysql/test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.cnf
 share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.test
+share/mysql/test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
 share/mysql/test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/suite/rpl/t/rpl_heartbeat-master.opt
 share/mysql/test/suite/rpl/t/rpl_heartbeat.test
@@ -6756,8 +6787,14 @@ share/mysql/test/suite/rpl/t/rpl_mixed_mixing_engines.test
 share/mysql/test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
 share/mysql/test/suite/rpl/t/rpl_mts_debug-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_debug.test
+share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
+share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
+share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
+share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
+share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
+share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt
 share/mysql/test/suite/rpl/t/rpl_multi_delete.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt
@@ -6823,6 +6860,10 @@ share/mysql/test/suite/rpl/t/rpl_ps.test
 share/mysql/test/suite/rpl/t/rpl_rbr_to_sbr.test
 share/mysql/test/suite/rpl/t/rpl_read_old_relay_log_info.test
 share/mysql/test/suite/rpl/t/rpl_read_only.test
+share/mysql/test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt
+share/mysql/test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
+share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
+share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_innodb.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_myisam.test
 share/mysql/test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -7258,6 +7299,7 @@ share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_64.result
 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_max_flush_queue_time_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_order_commits_basic.result
@@ -7854,6 +7896,7 @@ share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_64.test
 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_max_flush_queue_time_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_order_commits_basic.test
@@ -8842,6 +8885,8 @@ share/mysql/test/t/innodb_mysql_lock2.test
 share/mysql/test/t/innodb_mysql_sync.test
 share/mysql/test/t/innodb_pk_extension_off.test
 share/mysql/test/t/innodb_pk_extension_on.test
+share/mysql/test/t/innodb_recovery_with_upper_case_names-master.opt
+share/mysql/test/t/innodb_recovery_with_upper_case_names.test
 share/mysql/test/t/insert.test
 share/mysql/test/t/insert_notembedded.test
 share/mysql/test/t/insert_select.test
@@ -9004,6 +9049,7 @@ 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_mixed_or_statment.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