Changes 5.0.37:

* Added the SHOW PROFILES and SHOW PROFILE statements to display statement
  profile data, and the accompanying INFORMATION_SCHEMA.PROFILING table.

* Added the Uptime_since_flush_status status variable, which indicates the
  number of seconds since the most recent FLUSH STATUS statement.

* Incompatible change in DATE_FORMAT().

* NDB Cluster: The LockPagesInMainMemory configuration parameter has changed
  its type and possible values.

* The bundled yaSSL library was upgraded to version 1.5.8.

* The --skip-thread-priority option now is enabled by default for binary Mac
  OS X distributions. Use of thread priorities degrades performance on Mac OS X.

* Added the --disable-grant-options option to configure.

* Bug fixes.

1 files changed, 78 insertions, 15 deletions

diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 534189b07db..8aba6382e6b 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/10/14 18:41:34 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/03/11 18:42:49 adam Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -25,7 +25,6 @@ lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libvio.a
 libexec/mysqld
-man/man1/mysqld.1
 man/man1/mysqld_multi.1
 man/man8/mysqld.8
 man/man8/mysqlmanager.8
@@ -34,7 +33,9 @@ share/mysql-test/README
 share/mysql-test/cacert.pem
 share/mysql-test/client-cert.pem
 share/mysql-test/client-key.pem
+share/mysql-test/include/analyze_failure_sync_with_master.test
 share/mysql-test/include/big_test.inc
+share/mysql-test/include/check-testcase.test
 share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/common-tests.inc
 share/mysql-test/include/ctype_common.inc
@@ -78,11 +79,11 @@ share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_udf.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_env.inc
+share/mysql-test/include/innodb_rollback_on_timeout.inc
 share/mysql-test/include/is_debug_build.inc
 share/mysql-test/include/loaddata_autocom.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
-share/mysql-test/include/mysqltest_while.inc
 share/mysql-test/include/ndb_default_cluster.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
@@ -94,17 +95,18 @@ share/mysql-test/include/ps_modify.inc
 share/mysql-test/include/ps_modify1.inc
 share/mysql-test/include/ps_query.inc
 share/mysql-test/include/ps_renew.inc
+share/mysql-test/include/report-features.test
 share/mysql-test/include/rpl_stmt_seq.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
-share/mysql-test/include/sourced.inc
-share/mysql-test/include/sourced1.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/strict_autoinc.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_for_query_to_suceed.inc
+share/mysql-test/include/wait_show_pattern.inc
 share/mysql-test/include/wait_slave_status.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
@@ -113,6 +115,7 @@ share/mysql-test/lib/mtr_cases.pl
 share/mysql-test/lib/mtr_diff.pl
 share/mysql-test/lib/mtr_gcov.pl
 share/mysql-test/lib/mtr_gprof.pl
+share/mysql-test/lib/mtr_im.pl
 share/mysql-test/lib/mtr_io.pl
 share/mysql-test/lib/mtr_match.pl
 share/mysql-test/lib/mtr_misc.pl
@@ -120,10 +123,13 @@ share/mysql-test/lib/mtr_process.pl
 share/mysql-test/lib/mtr_report.pl
 share/mysql-test/lib/mtr_stress.pl
 share/mysql-test/lib/mtr_timer.pl
+share/mysql-test/lib/mtr_unique.pl
 share/mysql-test/mtr
 share/mysql-test/mysql-test-run
+share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/alias.result
+share/mysql-test/r/alter_table-big.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
 share/mysql-test/r/analyze.result
@@ -139,6 +145,7 @@ share/mysql-test/r/bdb-deadlock.result
 share/mysql-test/r/bdb.result
 share/mysql-test/r/bdb_cache.result
 share/mysql-test/r/bdb_gis.result
+share/mysql-test/r/bdb_notembedded.result
 share/mysql-test/r/bench_count_distinct.result
 share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
@@ -178,6 +185,7 @@ share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_euckr.result
 share/mysql-test/r/ctype_gb2312.result
 share/mysql-test/r/ctype_gbk.result
+share/mysql-test/r/ctype_hebrew.result
 share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
@@ -206,12 +214,17 @@ share/mysql-test/r/empty_table.result
 share/mysql-test/r/endspace.result
 share/mysql-test/r/errors.result
 share/mysql-test/r/exampledb.result
+share/mysql-test/r/execution_constants.result
 share/mysql-test/r/explain.result
 share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
+share/mysql-test/r/fix_priv_tables.result
+share/mysql-test/r/fix_priv_tabs.result
 share/mysql-test/r/flush.result
+share/mysql-test/r/flush2.result
 share/mysql-test/r/flush_block_commit.result
+share/mysql-test/r/flush_block_commit_notembedded.result
 share/mysql-test/r/flush_read_lock_kill.result
 share/mysql-test/r/flush_table.result
 share/mysql-test/r/foreign_key.result
@@ -282,6 +295,7 @@ share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_latin2_ch.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
+share/mysql-test/r/have_mysql_upgrade.result
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_ndb_status_ok.require
 share/mysql-test/r/have_openssl.require
@@ -329,8 +343,10 @@ share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/innodb_mysql.result
 share/mysql-test/r/innodb_notembedded.result
+share/mysql-test/r/innodb_timeout_rollback.result
 share/mysql-test/r/innodb_unsafe_binlog.result
 share/mysql-test/r/insert.result
+share/mysql-test/r/insert_notembedded.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
 share/mysql-test/r/insert_update.result
@@ -372,6 +388,8 @@ share/mysql-test/r/myisam.result
 share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_client_test.result
 share/mysql-test/r/mysql_protocols.result
+share/mysql-test/r/mysql_upgrade.result
+share/mysql-test/r/mysqladmin.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
@@ -436,6 +454,7 @@ share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
+share/mysql-test/r/profiling.result
 share/mysql-test/r/ps.result
 share/mysql-test/r/ps_10nestset.result
 share/mysql-test/r/ps_11bugs.result
@@ -457,6 +476,7 @@ share/mysql-test/r/rename.result
 share/mysql-test/r/repair.result
 share/mysql-test/r/replace.result
 share/mysql-test/r/rollback.result
+share/mysql-test/r/round.result
 share/mysql-test/r/row.result
 share/mysql-test/r/rowid_order_bdb.result
 share/mysql-test/r/rowid_order_innodb.result
@@ -473,14 +493,13 @@ share/mysql-test/r/rpl000012.result
 share/mysql-test/r/rpl000013.result
 share/mysql-test/r/rpl000015.result
 share/mysql-test/r/rpl000017.result
-share/mysql-test/r/rpl000018.result
 share/mysql-test/r/rpl_EE_error.result
 share/mysql-test/r/rpl_alter.result
 share/mysql-test/r/rpl_auto_increment.result
 share/mysql-test/r/rpl_auto_increment_11932.result
-share/mysql-test/r/rpl_chain_temp_table.result
 share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
+share/mysql-test/r/rpl_charset_sjis.result
 share/mysql-test/r/rpl_commit_after_flush.result
 share/mysql-test/r/rpl_create_database.result
 share/mysql-test/r/rpl_ddl.result
@@ -494,12 +513,10 @@ share/mysql-test/r/rpl_dual_pos_advance.result
 share/mysql-test/r/rpl_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
 share/mysql-test/r/rpl_failed_optimize.result
-share/mysql-test/r/rpl_failsafe.result
 share/mysql-test/r/rpl_flush_log_loop.result
 share/mysql-test/r/rpl_flush_tables.result
 share/mysql-test/r/rpl_free_items.result
 share/mysql-test/r/rpl_get_lock.result
-share/mysql-test/r/rpl_heap.result
 share/mysql-test/r/rpl_ignore_grant.result
 share/mysql-test/r/rpl_ignore_revoke.result
 share/mysql-test/r/rpl_ignore_table.result
@@ -512,6 +529,7 @@ share/mysql-test/r/rpl_loaddata.result
 share/mysql-test/r/rpl_loaddata_rule_m.result
 share/mysql-test/r/rpl_loaddata_rule_s.result
 share/mysql-test/r/rpl_loaddatalocal.result
+share/mysql-test/r/rpl_locale.result
 share/mysql-test/r/rpl_log.result
 share/mysql-test/r/rpl_log_pos.result
 share/mysql-test/r/rpl_many_optimize.result
@@ -529,6 +547,7 @@ share/mysql-test/r/rpl_mystery22.result
 share/mysql-test/r/rpl_ndb_innodb_trans.result
 share/mysql-test/r/rpl_openssl.result
 share/mysql-test/r/rpl_optimize.result
+share/mysql-test/r/rpl_packet.result
 share/mysql-test/r/rpl_ps.result
 share/mysql-test/r/rpl_redirect.result
 share/mysql-test/r/rpl_relayrotate.result
@@ -577,10 +596,13 @@ share/mysql-test/r/sp-threads.result
 share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_notembedded.result
+share/mysql-test/r/sp_stress_case.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl.result
 share/mysql-test/r/ssl_compress.result
+share/mysql-test/r/ssl_connect.result
+share/mysql-test/r/ssl_des.result
 share/mysql-test/r/status.result
 share/mysql-test/r/strict.result
 share/mysql-test/r/strict_autoinc_1myisam.result
@@ -590,6 +612,7 @@ share/mysql-test/r/strict_autoinc_4bdb.result
 share/mysql-test/r/strict_autoinc_5ndb.result
 share/mysql-test/r/subselect.result
 share/mysql-test/r/subselect2.result
+share/mysql-test/r/subselect3.result
 share/mysql-test/r/subselect_gis.result
 share/mysql-test/r/subselect_innodb.result
 share/mysql-test/r/subselect_notembedded.result
@@ -606,6 +629,7 @@ share/mysql-test/r/testdb_only.require
 share/mysql-test/r/timezone.result
 share/mysql-test/r/timezone2.result
 share/mysql-test/r/timezone3.result
+share/mysql-test/r/timezone4.result
 share/mysql-test/r/timezone_grant.result
 share/mysql-test/r/trigger-compat.result
 share/mysql-test/r/trigger-grant.result
@@ -651,8 +675,12 @@ share/mysql-test/server-cert.pem
 share/mysql-test/server-key.pem
 share/mysql-test/std_data/14897.frm
 share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/bad_gis_data.dat
 share/mysql-test/std_data/bug15328.cnf
 share/mysql-test/std_data/bug16266.000001
+share/mysql-test/std_data/bug19371.MYD
+share/mysql-test/std_data/bug19371.MYI
+share/mysql-test/std_data/bug19371.frm
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
 share/mysql-test/std_data/client-key.pem
@@ -671,7 +699,9 @@ share/mysql-test/std_data/ndb_config_mycnf2.cnf
 share/mysql-test/std_data/rpl_loaddata.dat
 share/mysql-test/std_data/rpl_loaddata2.dat
 share/mysql-test/std_data/rpl_timezone.dat
+share/mysql-test/std_data/server-cert-des.pem
 share/mysql-test/std_data/server-cert.pem
+share/mysql-test/std_data/server-key-des.pem
 share/mysql-test/std_data/server-key.pem
 share/mysql-test/std_data/trunc_binlog.000001
 share/mysql-test/std_data/untrusted-cacert.pem
@@ -679,6 +709,7 @@ share/mysql-test/std_data/vchar.frm
 share/mysql-test/std_data/warnings_loaddata.dat
 share/mysql-test/std_data/words.dat
 share/mysql-test/t/alias.test
+share/mysql-test/t/alter_table-big.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
 share/mysql-test/t/analyze.test
@@ -697,6 +728,7 @@ share/mysql-test/t/bdb.test
 share/mysql-test/t/bdb_cache-master.opt
 share/mysql-test/t/bdb_cache.test
 share/mysql-test/t/bdb_gis.test
+share/mysql-test/t/bdb_notembedded.test
 share/mysql-test/t/bench_count_distinct.test
 share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
@@ -735,6 +767,7 @@ share/mysql-test/t/ctype_eucjpms.test
 share/mysql-test/t/ctype_euckr.test
 share/mysql-test/t/ctype_gb2312.test
 share/mysql-test/t/ctype_gbk.test
+share/mysql-test/t/ctype_hebrew.test
 share/mysql-test/t/ctype_latin1.test
 share/mysql-test/t/ctype_latin1_de-master.opt
 share/mysql-test/t/ctype_latin1_de.test
@@ -767,12 +800,17 @@ share/mysql-test/t/empty_table.test
 share/mysql-test/t/endspace.test
 share/mysql-test/t/errors.test
 share/mysql-test/t/exampledb.test
+share/mysql-test/t/execution_constants.test
 share/mysql-test/t/explain.test
 share/mysql-test/t/federated.test
 share/mysql-test/t/federated_archive.test
 share/mysql-test/t/federated_bug_13118.test
+share/mysql-test/t/fix_priv_tables.test
 share/mysql-test/t/flush.test
+share/mysql-test/t/flush2-master.opt
+share/mysql-test/t/flush2.test
 share/mysql-test/t/flush_block_commit.test
+share/mysql-test/t/flush_block_commit_notembedded.test
 share/mysql-test/t/flush_read_lock_kill-master.opt
 share/mysql-test/t/flush_read_lock_kill.test
 share/mysql-test/t/flush_table.test
@@ -863,11 +901,15 @@ share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/innodb_mysql-master.opt
 share/mysql-test/t/innodb_mysql.test
 share/mysql-test/t/innodb_notembedded.test
+share/mysql-test/t/innodb_timeout_rollback-master.opt
+share/mysql-test/t/innodb_timeout_rollback.test
 share/mysql-test/t/innodb_unsafe_binlog-master.opt
 share/mysql-test/t/innodb_unsafe_binlog.test
 share/mysql-test/t/insert.test
+share/mysql-test/t/insert_notembedded.test
 share/mysql-test/t/insert_select-binlog.test
 share/mysql-test/t/insert_select.test
 share/mysql-test/t/insert_update.test
@@ -891,6 +933,7 @@ share/mysql-test/t/lock.test
 share/mysql-test/t/lock_multi.test
 share/mysql-test/t/lock_tables_lost_commit-master.opt
 share/mysql-test/t/lock_tables_lost_commit.test
+share/mysql-test/t/log.sh
 share/mysql-test/t/lowercase_fs_off.test
 share/mysql-test/t/lowercase_table-master.opt
 share/mysql-test/t/lowercase_table.test
@@ -918,8 +961,11 @@ share/mysql-test/t/mysql.test
 share/mysql-test/t/mysql_client_test.opt
 share/mysql-test/t/mysql_client_test.test
 share/mysql-test/t/mysql_delimiter.sql
+share/mysql-test/t/mysql_delimiter_19799.sql
 share/mysql-test/t/mysql_delimiter_source.sql
 share/mysql-test/t/mysql_protocols.test
+share/mysql-test/t/mysql_upgrade.test
+share/mysql-test/t/mysqladmin.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
@@ -982,6 +1028,8 @@ share/mysql-test/t/overflow.test
 share/mysql-test/t/packet.test
 share/mysql-test/t/perror.test
 share/mysql-test/t/preload.test
+share/mysql-test/t/profiling.test
+share/mysql-test/t/ps-master.opt
 share/mysql-test/t/ps.test
 share/mysql-test/t/ps_10nestset.test
 share/mysql-test/t/ps_11bugs.test
@@ -1003,6 +1051,7 @@ share/mysql-test/t/rename.test
 share/mysql-test/t/repair.test
 share/mysql-test/t/replace.test
 share/mysql-test/t/rollback.test
+share/mysql-test/t/round.test
 share/mysql-test/t/row.test
 share/mysql-test/t/rowid_order_bdb.test
 share/mysql-test/t/rowid_order_innodb.test
@@ -1030,15 +1079,14 @@ share/mysql-test/t/rpl000017-slave.sh
 share/mysql-test/t/rpl000017.test
 share/mysql-test/t/rpl000018-master.opt
 share/mysql-test/t/rpl000018-slave.opt
-share/mysql-test/t/rpl000018.test
 share/mysql-test/t/rpl_EE_error.test
 share/mysql-test/t/rpl_alter.test
 share/mysql-test/t/rpl_auto_increment-master.opt
 share/mysql-test/t/rpl_auto_increment.test
 share/mysql-test/t/rpl_auto_increment_11932.test
-share/mysql-test/t/rpl_chain_temp_table.test
 share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
+share/mysql-test/t/rpl_charset_sjis.test
 share/mysql-test/t/rpl_commit_after_flush.test
 share/mysql-test/t/rpl_create_database-master.opt
 share/mysql-test/t/rpl_create_database-slave.opt
@@ -1054,12 +1102,12 @@ share/mysql-test/t/rpl_drop_temp-slave.opt
 share/mysql-test/t/rpl_drop_temp.test
 share/mysql-test/t/rpl_dual_pos_advance-master.opt
 share/mysql-test/t/rpl_dual_pos_advance.test
+share/mysql-test/t/rpl_empty_master_crash-master.opt
 share/mysql-test/t/rpl_empty_master_crash.test
 share/mysql-test/t/rpl_error_ignored_table-slave.opt
 share/mysql-test/t/rpl_error_ignored_table.test
 share/mysql-test/t/rpl_failed_optimize-master.opt
 share/mysql-test/t/rpl_failed_optimize.test
-share/mysql-test/t/rpl_failsafe.test
 share/mysql-test/t/rpl_flush_log_loop-master.opt
 share/mysql-test/t/rpl_flush_log_loop-master.sh
 share/mysql-test/t/rpl_flush_log_loop-slave.opt
@@ -1069,7 +1117,6 @@ share/mysql-test/t/rpl_flush_tables.test
 share/mysql-test/t/rpl_free_items-slave.opt
 share/mysql-test/t/rpl_free_items.test
 share/mysql-test/t/rpl_get_lock.test
-share/mysql-test/t/rpl_heap.test
 share/mysql-test/t/rpl_ignore_grant-slave.opt
 share/mysql-test/t/rpl_ignore_grant.test
 share/mysql-test/t/rpl_ignore_revoke-slave.opt
@@ -1090,6 +1137,7 @@ share/mysql-test/t/rpl_loaddata_rule_m.test
 share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
 share/mysql-test/t/rpl_loaddata_rule_s.test
 share/mysql-test/t/rpl_loaddatalocal.test
+share/mysql-test/t/rpl_locale.test
 share/mysql-test/t/rpl_log-master.opt
 share/mysql-test/t/rpl_log-slave.opt
 share/mysql-test/t/rpl_log.test
@@ -1115,6 +1163,9 @@ share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt
 share/mysql-test/t/rpl_ndb_innodb_trans.test
 share/mysql-test/t/rpl_openssl.test
 share/mysql-test/t/rpl_optimize.test
+share/mysql-test/t/rpl_packet-master.opt
+share/mysql-test/t/rpl_packet-slave.opt
+share/mysql-test/t/rpl_packet.test
 share/mysql-test/t/rpl_ps.test
 share/mysql-test/t/rpl_redirect.test
 share/mysql-test/t/rpl_relayrotate-slave.opt
@@ -1163,6 +1214,7 @@ share/mysql-test/t/schema.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
 share/mysql-test/t/select_safe.test
+share/mysql-test/t/show_check-master.opt
 share/mysql-test/t/show_check.test
 share/mysql-test/t/skip_grants-master.opt
 share/mysql-test/t/skip_grants.test
@@ -1179,10 +1231,14 @@ share/mysql-test/t/sp-threads.test
 share/mysql-test/t/sp-vars.test
 share/mysql-test/t/sp.test
 share/mysql-test/t/sp_notembedded.test
+share/mysql-test/t/sp_stress_case.test
 share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sql_mode.test
 share/mysql-test/t/ssl.test
 share/mysql-test/t/ssl_compress.test
+share/mysql-test/t/ssl_connect.test
+share/mysql-test/t/ssl_des-master.opt
+share/mysql-test/t/ssl_des.test
 share/mysql-test/t/status.test
 share/mysql-test/t/strict.test
 share/mysql-test/t/strict_autoinc_1myisam.test
@@ -1192,6 +1248,7 @@ share/mysql-test/t/strict_autoinc_4bdb.test
 share/mysql-test/t/strict_autoinc_5ndb.test
 share/mysql-test/t/subselect.test
 share/mysql-test/t/subselect2.test
+share/mysql-test/t/subselect3.test
 share/mysql-test/t/subselect_gis.test
 share/mysql-test/t/subselect_innodb.test
 share/mysql-test/t/subselect_notembedded.test
@@ -1202,8 +1259,10 @@ share/mysql-test/t/synchronization.test
 share/mysql-test/t/sysdate_is_now-master.opt
 share/mysql-test/t/sysdate_is_now.test
 share/mysql-test/t/system_mysql_db.test
-share/mysql-test/t/system_mysql_db_fix-master.opt
-share/mysql-test/t/system_mysql_db_fix.test
+share/mysql-test/t/system_mysql_db_fix30020-master.opt
+share/mysql-test/t/system_mysql_db_fix30020.test
+share/mysql-test/t/system_mysql_db_fix40123-master.opt
+share/mysql-test/t/system_mysql_db_fix40123.test
 share/mysql-test/t/system_mysql_db_refs.test
 share/mysql-test/t/tablelock.test
 share/mysql-test/t/temp_table-master.opt
@@ -1213,6 +1272,8 @@ share/mysql-test/t/timezone.test
 share/mysql-test/t/timezone2.test
 share/mysql-test/t/timezone3-master.opt
 share/mysql-test/t/timezone3.test
+share/mysql-test/t/timezone4-master.opt
+share/mysql-test/t/timezone4.test
 share/mysql-test/t/timezone_grant.test
 share/mysql-test/t/trigger-compat.test
 share/mysql-test/t/trigger-grant.test
@@ -1245,12 +1306,14 @@ share/mysql-test/t/update.test
 share/mysql-test/t/user_limits.test
 share/mysql-test/t/user_var-binlog.test
 share/mysql-test/t/user_var.test
+share/mysql-test/t/utils.sh
 share/mysql-test/t/varbinary.test
 share/mysql-test/t/variables.test
 share/mysql-test/t/view.test
 share/mysql-test/t/view_grant.test
 share/mysql-test/t/view_query_cache.test
 share/mysql-test/t/wait_for_process.sh
+share/mysql-test/t/wait_for_socket.sh
 share/mysql-test/t/wait_timeout-master.opt
 share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt