Update mysql51-{client,server} package to 5.1.55.

Full changes: http://dev.mysql.com/doc/refman/5.1/en/news-5-1-55.html

MySQL 5.1.55

Functionality added or changed:

The time zone tables available at
http://dev.mysql.com/downloads/timezones.html have been updated. These
tables can be used on systems such as Windows or HP-UX that do not
include zoneinfo files. (Bug#40230)

4 files changed, 89 insertions, 59 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 8ae54c790b5..343e8f23c9c 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.16 2010/12/16 03:42:49 taca Exp $
+# $NetBSD: Makefile.common,v 1.17 2011/02/13 16:19:45 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.54
+DISTNAME=		mysql-5.1.55
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index ce620310f39..dac2b1042a0 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2010/12/16 03:42:49 taca Exp $
+$NetBSD: distinfo,v 1.13 2011/02/13 16:19:45 taca Exp $
 
-SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
-RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
-Size (mysql-5.1.54.tar.gz) = 23672236 bytes
+SHA1 (mysql-5.1.55.tar.gz) = 8bf67d2d527368e325e5dbdd833f6f47eaf7a8c1
+RMD160 (mysql-5.1.55.tar.gz) = f4ab2500c5d1f15b343b6bbf798b89081d4d0e7c
+Size (mysql-5.1.55.tar.gz) = 23769743 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = 66ea5217d98d33e1be44e4dda754a94496f1ea44
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 95c8560ce11..ba5d732e784 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/12/16 03:42:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.13 2011/02/13 16:19:45 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -129,8 +129,8 @@ share/mysql-test/extra/rpl_tests/rpl_conflicts.test
 share/mysql-test/extra/rpl_tests/rpl_ddl.test
 share/mysql-test/extra/rpl_tests/rpl_deadlock.test
 share/mysql-test/extra/rpl_tests/rpl_delete_no_where.test
-share/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
-share/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
+share/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+share/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
 share/mysql-test/extra/rpl_tests/rpl_failed_optimize.test
 share/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
 share/mysql-test/extra/rpl_tests/rpl_foreign_key.test
@@ -169,11 +169,11 @@ share/mysql-test/extra/rpl_tests/rpl_row_sp006.test
 share/mysql-test/extra/rpl_tests/rpl_row_sp007.test
 share/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
 share/mysql-test/extra/rpl_tests/rpl_set_null.test
-share/mysql-test/extra/rpl_tests/rpl_stm_000001.test
 share/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
 share/mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
 share/mysql-test/extra/rpl_tests/rpl_stop_slave.test
 share/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
+share/mysql-test/extra/rpl_tests/rpl_test_framework.inc
 share/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test
 share/mysql-test/extra/rpl_tests/rpl_trig004.test
 share/mysql-test/extra/rpl_tests/rpl_truncate.test
@@ -181,6 +181,8 @@ share/mysql-test/extra/rpl_tests/rpl_truncate_helper.test
 share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/analyze-sync_with_master.test
 share/mysql-test/include/analyze-timeout.test
+share/mysql-test/include/assert.inc
+share/mysql-test/include/begin_include_file.inc
 share/mysql-test/include/big_test.inc
 share/mysql-test/include/binlog_inject_error.inc
 share/mysql-test/include/check-testcase.test
@@ -194,14 +196,13 @@ share/mysql-test/include/check_slave_is_running.inc
 share/mysql-test/include/check_slave_no_error.inc
 share/mysql-test/include/check_slave_param.inc
 share/mysql-test/include/check_var_limit.inc
-share/mysql-test/include/circular_rpl_for_4_hosts_init.inc
-share/mysql-test/include/circular_rpl_for_4_hosts_sync.inc
 share/mysql-test/include/cleanup_fake_relay_log.inc
 share/mysql-test/include/commit.inc
 share/mysql-test/include/common-tests.inc
 share/mysql-test/include/concurrent.inc
 share/mysql-test/include/connect2.inc
 share/mysql-test/include/count_sessions.inc
+share/mysql-test/include/ctype_8bit.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_german.inc
@@ -218,9 +219,12 @@ share/mysql-test/include/default_my.cnf
 share/mysql-test/include/default_mysqld.cnf
 share/mysql-test/include/default_ndbd.cnf
 share/mysql-test/include/delete_anonymous_users.inc
-share/mysql-test/include/diff_master_slave.inc
 share/mysql-test/include/diff_tables.inc
+share/mysql-test/include/end_include_file.inc
 share/mysql-test/include/endspace.inc
+share/mysql-test/include/file_does_not_exist.inc
+share/mysql-test/include/force_restart.inc
+share/mysql-test/include/force_restart_if_skipped.inc
 share/mysql-test/include/get_binlog_dump_thread_id.inc
 share/mysql-test/include/get_relay_log_pos.inc
 share/mysql-test/include/gis_generic.inc
@@ -293,14 +297,13 @@ share/mysql-test/include/index_merge_ror.inc
 share/mysql-test/include/index_merge_ror_cpk.inc
 share/mysql-test/include/innodb_rollback_on_timeout.inc
 share/mysql-test/include/innodb_trx_weight.inc
+share/mysql-test/include/io_thd_fault_injection.inc
 share/mysql-test/include/is_embedded.inc
 share/mysql-test/include/kill_query.inc
 share/mysql-test/include/kill_query_and_diff_master_slave.inc
 share/mysql-test/include/linux_sys_vars.inc
 share/mysql-test/include/load_sysvars.inc
 share/mysql-test/include/loaddata_autocom.inc
-share/mysql-test/include/master-slave-end.inc
-share/mysql-test/include/master-slave-reset.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/min_null_cond.inc
 share/mysql-test/include/mix1.inc
@@ -349,19 +352,34 @@ share/mysql-test/include/query_cache.inc
 share/mysql-test/include/query_cache_sql_prepare.inc
 share/mysql-test/include/read_many_rows.inc
 share/mysql-test/include/report-features.test
-share/mysql-test/include/reset_master_and_slave.inc
 share/mysql-test/include/restart_mysqld.inc
 share/mysql-test/include/rowid_order.inc
-share/mysql-test/include/rpl_diff_tables.inc
+share/mysql-test/include/rpl_change_topology.inc
+share/mysql-test/include/rpl_connect.inc
+share/mysql-test/include/rpl_connection.inc
+share/mysql-test/include/rpl_diff.inc
+share/mysql-test/include/rpl_end.inc
 share/mysql-test/include/rpl_events.inc
+share/mysql-test/include/rpl_for_each_slave.inc
+share/mysql-test/include/rpl_generate_sync_chain.inc
+share/mysql-test/include/rpl_init.inc
 share/mysql-test/include/rpl_loaddata_charset.inc
 share/mysql-test/include/rpl_multi_engine.inc
 share/mysql-test/include/rpl_multi_engine2.inc
 share/mysql-test/include/rpl_multi_engine3.inc
+share/mysql-test/include/rpl_reconnect.inc
+share/mysql-test/include/rpl_reset.inc
+share/mysql-test/include/rpl_restart_server.inc
+share/mysql-test/include/rpl_start_server.inc
+share/mysql-test/include/rpl_start_slaves.inc
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/rpl_stop_server.inc
+share/mysql-test/include/rpl_stop_slaves.inc
+share/mysql-test/include/rpl_sync.inc
 share/mysql-test/include/rpl_udf.inc
 share/mysql-test/include/running_event_scheduler.inc
 share/mysql-test/include/safe_set_to_maybe_ro_var.inc
+share/mysql-test/include/save_master_pos.inc
 share/mysql-test/include/select_ndb_apply_status.inc
 share/mysql-test/include/set_binlog_format_mixed.sql
 share/mysql-test/include/set_binlog_format_row.sql
@@ -380,8 +398,12 @@ share/mysql-test/include/show_slave_status.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/start_slave.inc
 share/mysql-test/include/stop_slave.inc
+share/mysql-test/include/stop_slave_io.inc
+share/mysql-test/include/stop_slave_sql.inc
 share/mysql-test/include/strict_autoinc.inc
+share/mysql-test/include/sync_io_with_master.inc
 share/mysql-test/include/sync_slave_io_with_master.inc
+share/mysql-test/include/sync_slave_sql_with_io.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_fieldsize.inc
 share/mysql-test/include/test_outfile.inc
@@ -396,6 +418,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_query_to_fail.inc
 share/mysql-test/include/wait_for_query_to_succeed.inc
 share/mysql-test/include/wait_for_slave_io_error.inc
 share/mysql-test/include/wait_for_slave_io_to_start.inc
@@ -415,6 +438,7 @@ share/mysql-test/include/wait_until_disconnected.inc
 share/mysql-test/include/wait_until_rows_count.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/include/windows_sys_vars.inc
+share/mysql-test/include/write_var_to_file.inc
 share/mysql-test/lib/My/Config.pm
 share/mysql-test/lib/My/ConfigFactory.pm
 share/mysql-test/lib/My/CoreDump.pm
@@ -1163,10 +1187,10 @@ share/mysql-test/std_data/warnings_loaddata.dat
 share/mysql-test/std_data/words.dat
 share/mysql-test/std_data/words2.dat
 share/mysql-test/suite/binlog/combinations
-share/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
 share/mysql-test/suite/binlog/r/binlog_base64_flag.result
 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_grant.result
 share/mysql-test/suite/binlog/r/binlog_incident.result
 share/mysql-test/suite/binlog/r/binlog_index.result
@@ -1179,6 +1203,7 @@ share/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
 share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql-test/suite/binlog/r/binlog_multi_engine.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_row_binlog.result
 share/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
 share/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
@@ -1189,6 +1214,8 @@ share/mysql-test/suite/binlog/r/binlog_row_insert_select.result
 share/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
 share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result
 share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
+share/mysql-test/suite/binlog/r/binlog_server_id.result
+share/mysql-test/suite/binlog/r/binlog_sf.result
 share/mysql-test/suite/binlog/r/binlog_sql_mode.result
 share/mysql-test/suite/binlog/r/binlog_start_comment.result
 share/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
@@ -1220,11 +1247,10 @@ share/mysql-test/suite/binlog/std_data/ver_5_1_17.001
 share/mysql-test/suite/binlog/std_data/ver_5_1_23.001
 share/mysql-test/suite/binlog/std_data/write-full-row.binlog
 share/mysql-test/suite/binlog/std_data/write-partial-row.binlog
-share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt
-share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
 share/mysql-test/suite/binlog/t/binlog_base64_flag.test
 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_grant.test
 share/mysql-test/suite/binlog/t/binlog_incident-master.opt
 share/mysql-test/suite/binlog/t/binlog_incident.test
@@ -1240,6 +1266,8 @@ share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
 share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test
 share/mysql-test/suite/binlog/t/binlog_multi_engine.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
 share/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
 share/mysql-test/suite/binlog/t/binlog_row_binlog.test
 share/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
@@ -1253,6 +1281,8 @@ share/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
 share/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test
 share/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
 share/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
+share/mysql-test/suite/binlog/t/binlog_server_id.test
+share/mysql-test/suite/binlog/t/binlog_sf.test
 share/mysql-test/suite/binlog/t/binlog_sql_mode.test
 share/mysql-test/suite/binlog/t/binlog_start_comment.test
 share/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test
@@ -2223,6 +2253,8 @@ share/mysql-test/suite/federated/federated_bug_13118.result
 share/mysql-test/suite/federated/federated_bug_13118.test
 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
@@ -2401,7 +2433,7 @@ share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
-share/mysql-test/suite/funcs_1/r/myisam_views.result
+share/mysql-test/suite/funcs_1/r/myisam_views-big.result
 share/mysql-test/suite/funcs_1/r/ndb_bitdata.result
 share/mysql-test/suite/funcs_1/r/ndb_cursors.result
 share/mysql-test/suite/funcs_1/r/ndb_func_view.result
@@ -2551,7 +2583,7 @@ share/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
-share/mysql-test/suite/funcs_1/t/myisam_views.test
+share/mysql-test/suite/funcs_1/t/myisam_views-big.test
 share/mysql-test/suite/funcs_1/t/ndb_bitdata.test
 share/mysql-test/suite/funcs_1/t/ndb_cursors.test
 share/mysql-test/suite/funcs_1/t/ndb_func_view.test
@@ -2727,7 +2759,9 @@ share/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc
 share/mysql-test/suite/innodb_plugin/include/innodb-index.inc
 share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
 share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result
+share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-18274.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
+share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-56228.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
 share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
@@ -2800,7 +2834,10 @@ share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
 share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
 share/mysql-test/suite/innodb_plugin/t/disabled.def
 share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
 share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
@@ -3564,22 +3601,23 @@ share/mysql-test/suite/rpl/include/rpl_mixed_show_binlog_format.inc
 share/mysql-test/suite/rpl/my.cnf
 share/mysql-test/suite/rpl/r/rpl000001.a.result
 share/mysql-test/suite/rpl/r/rpl000001.b.result
-share/mysql-test/suite/rpl/r/rpl000010.result
-share/mysql-test/suite/rpl/r/rpl000011.result
-share/mysql-test/suite/rpl/r/rpl000013.result
-share/mysql-test/suite/rpl/r/rpl000017.result
+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_EE_err.result
 share/mysql-test/suite/rpl/r/rpl_LD_INFILE.result
 share/mysql-test/suite/rpl/r/rpl_alter.result
 share/mysql-test/suite/rpl/r/rpl_alter_db.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
+share/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
 share/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
+share/mysql-test/suite/rpl/r/rpl_binlog_errors.result
 share/mysql-test/suite/rpl/r/rpl_binlog_grant.result
 share/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
-share/mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result
 share/mysql-test/suite/rpl/r/rpl_bit.result
 share/mysql-test/suite/rpl/r/rpl_bit_npk.result
 share/mysql-test/suite/rpl/r/rpl_blackhole.result
@@ -3608,17 +3646,16 @@ share/mysql-test/suite/rpl/r/rpl_delete_no_where.result
 share/mysql-test/suite/rpl/r/rpl_do_grant.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_if_exists.result
 share/mysql-test/suite/rpl/r/rpl_drop_temp.result
 share/mysql-test/suite/rpl/r/rpl_drop_view.result
 share/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
 share/mysql-test/suite/rpl/r/rpl_empty_master_crash.result
 share/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
 share/mysql-test/suite/rpl/r/rpl_events.result
-share/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
-share/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
-share/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
-share/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
+share/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
+share/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
+share/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
+share/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
 share/mysql-test/suite/rpl/r/rpl_failed_optimize.result
 share/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
 share/mysql-test/suite/rpl/r/rpl_flushlog_loop.result
@@ -3758,14 +3795,12 @@ share/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
 share/mysql-test/suite/rpl/r/rpl_row_until.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_server_id.result
 share/mysql-test/suite/rpl/r/rpl_server_id1.result
 share/mysql-test/suite/rpl/r/rpl_server_id2.result
 share/mysql-test/suite/rpl/r/rpl_session_var.result
 share/mysql-test/suite/rpl/r/rpl_set_charset.result
 share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result
 share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result
-share/mysql-test/suite/rpl/r/rpl_sf.result
 share/mysql-test/suite/rpl/r/rpl_show_slave_running.result
 share/mysql-test/suite/rpl/r/rpl_skip_error.result
 share/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
@@ -3805,6 +3840,7 @@ share/mysql-test/suite/rpl/r/rpl_temp_table.result
 share/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.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_timezone.result
 share/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
 share/mysql-test/suite/rpl/r/rpl_trigger.result
@@ -3820,13 +3856,12 @@ share/mysql-test/suite/rpl/r/rpl_variables_stm.result
 share/mysql-test/suite/rpl/r/rpl_view.result
 share/mysql-test/suite/rpl/rpl_1slave_base.cnf
 share/mysql-test/suite/rpl/t/disabled.def
-share/mysql-test/suite/rpl/t/rpl000010-slave.opt
-share/mysql-test/suite/rpl/t/rpl000010.test
-share/mysql-test/suite/rpl/t/rpl000011.test
-share/mysql-test/suite/rpl/t/rpl000013.test
-share/mysql-test/suite/rpl/t/rpl000017-slave.opt
-share/mysql-test/suite/rpl/t/rpl000017-slave.sh
-share/mysql-test/suite/rpl/t/rpl000017.test
+share/mysql-test/suite/rpl/t/rpl_000010-slave.opt
+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-slave.opt
+share/mysql-test/suite/rpl/t/rpl_000017.test
 share/mysql-test/suite/rpl/t/rpl_EE_err.test
 share/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
 share/mysql-test/suite/rpl/t/rpl_alter.test
@@ -3834,16 +3869,16 @@ share/mysql-test/suite/rpl/t/rpl_alter_db.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
 share/mysql-test/suite/rpl/t/rpl_auto_increment.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
+share/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
-share/mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
 share/mysql-test/suite/rpl/t/rpl_binlog_corruption.test
+share/mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
+share/mysql-test/suite/rpl/t/rpl_binlog_errors.test
 share/mysql-test/suite/rpl/t/rpl_binlog_grant.test
 share/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
-share/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt
-share/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
 share/mysql-test/suite/rpl/t/rpl_bit.test
 share/mysql-test/suite/rpl/t/rpl_bit_npk.test
 share/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -3880,7 +3915,6 @@ share/mysql-test/suite/rpl/t/rpl_delete_no_where.test
 share/mysql-test/suite/rpl/t/rpl_do_grant.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_if_exists.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_view.test
@@ -3891,18 +3925,16 @@ share/mysql-test/suite/rpl/t/rpl_empty_master_crash.test
 share/mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
 share/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
 share/mysql-test/suite/rpl/t/rpl_events.test
-share/mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
-share/mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
-share/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test
-share/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test
+share/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
+share/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
+share/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
+share/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
 share/mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
 share/mysql-test/suite/rpl/t/rpl_failed_optimize.test
 share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
 share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
 share/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
-share/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh
 share/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
-share/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh
 share/mysql-test/suite/rpl/t/rpl_flushlog_loop.test
 share/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
 share/mysql-test/suite/rpl/t/rpl_found_rows.test
@@ -4018,8 +4050,6 @@ share/mysql-test/suite/rpl/t/rpl_report-slave.opt
 share/mysql-test/suite/rpl/t/rpl_report.test
 share/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
 share/mysql-test/suite/rpl/t/rpl_rewrt_db.test
-share/mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt
-share/mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh
 share/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
 share/mysql-test/suite/rpl/t/rpl_rotate_logs.test
 share/mysql-test/suite/rpl/t/rpl_row_001.test
@@ -4086,7 +4116,6 @@ share/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
 share/mysql-test/suite/rpl/t/rpl_row_until.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_server_id.test
 share/mysql-test/suite/rpl/t/rpl_server_id1.test
 share/mysql-test/suite/rpl/t/rpl_server_id2-slave.opt
 share/mysql-test/suite/rpl/t/rpl_server_id2.test
@@ -4094,7 +4123,6 @@ share/mysql-test/suite/rpl/t/rpl_session_var.test
 share/mysql-test/suite/rpl/t/rpl_set_charset.test
 share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
 share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
-share/mysql-test/suite/rpl/t/rpl_sf.test
 share/mysql-test/suite/rpl/t/rpl_show_slave_running.test
 share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
 share/mysql-test/suite/rpl/t/rpl_skip_error.test
@@ -4149,6 +4177,8 @@ share/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
 share/mysql-test/suite/rpl/t/rpl_temporary.test
 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_timezone-master.opt
 share/mysql-test/suite/rpl/t/rpl_timezone-slave.opt
 share/mysql-test/suite/rpl/t/rpl_timezone.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index d9982b6644c..c2341c0f140 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2010/12/16 03:42:50 taca Exp $
+$NetBSD: distinfo,v 1.15 2011/02/13 16:19:45 taca Exp $
 
-SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
-RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
-Size (mysql-5.1.54.tar.gz) = 23672236 bytes
+SHA1 (mysql-5.1.55.tar.gz) = 8bf67d2d527368e325e5dbdd833f6f47eaf7a8c1
+RMD160 (mysql-5.1.55.tar.gz) = f4ab2500c5d1f15b343b6bbf798b89081d4d0e7c
+Size (mysql-5.1.55.tar.gz) = 23769743 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 1fc6939bb3021153b72479aa2413e50940878c98
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c