Update mysql4-{client,server} to 4.1.7 (latest production release).

MySQL version 4.1 offers dozens of important product enhancements
and new features, including support for:

    * Subqueries and derived tables -- allowing users to search
      complex data sets with greater ease and efficiency;
    * A significantly faster and more flexible client-server protocol
      with support for prepared statements, providing optimized query
      execution and improved warning information;
    * New GUI installer and configuration wizards for Linux and Windows,
      making it easier for developers to set up and optimize their
      MySQL databases;
    * Encrypted client-server communication using OpenSSL (GPL),
      greatly increasing security against malicious intrusion and
      unauthorized access.
    * A more highly-optimized MySQL server library with a smaller
      memory footprint that performs significantly faster when embedded
      in third-party software.
    * Extensive Unicode support through the utf8 and ucs2 international
      character sets for applications that require the use of local
      languages;
    * Industry-standard GIS spatial types for storing and managing
      geographic data;
    * Improved full text search and Help features.

1 files changed, 794 insertions, 26 deletions

diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index a849729b5a4..018b651699f 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -8,8 +8,8 @@ bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/mysql.server
-bin/mysql_install
 bin/mysql_install_db
+bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_safe
 bin/pack_isam
@@ -29,31 +29,791 @@ lib/mysql/libvio.a
 libexec/mysqld
 man/man1/mysqld.1
 man/man1/mysqld_multi.1
-@comment man/man1/mysqld_safe.1
-share/mysql/charsets/Index
+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/check_var_limit.inc
+share/mysql-test/include/have_archive.inc
+share/mysql-test/include/have_bdb.inc
+share/mysql-test/include/have_big5.inc
+share/mysql-test/include/have_compress.inc
+share/mysql-test/include/have_crypt.inc
+share/mysql-test/include/have_csv.inc
+share/mysql-test/include/have_debug.inc
+share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_geometry.inc
+share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_isam.inc
+share/mysql-test/include/have_ndb.inc
+share/mysql-test/include/have_openssl.inc
+share/mysql-test/include/have_openssl_1.inc
+share/mysql-test/include/have_query_cache.inc
+share/mysql-test/include/have_sjis.inc
+share/mysql-test/include/have_tis620.inc
+share/mysql-test/include/have_ucs2.inc
+share/mysql-test/include/have_ujis.inc
+share/mysql-test/include/master-slave.inc
+share/mysql-test/include/not_embedded.inc
+share/mysql-test/include/ps_conv.inc
+share/mysql-test/include/ps_create.inc
+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/system_db_struct.inc
+share/mysql-test/install_test_db
+share/mysql-test/mysql-test-run
+share/mysql-test/r/alias.result
+share/mysql-test/r/alter_table.result
+share/mysql-test/r/analyse.result
+share/mysql-test/r/ansi.result
+share/mysql-test/r/archive.result
+share/mysql-test/r/auto_increment.result
+share/mysql-test/r/backup.result
+share/mysql-test/r/bdb-alter-table-1.result
+share/mysql-test/r/bdb-alter-table-2.result
+share/mysql-test/r/bdb-crash.result
+share/mysql-test/r/bdb-deadlock.result
+share/mysql-test/r/bdb.result
+share/mysql-test/r/bdb_cache.result
+share/mysql-test/r/bench_count_distinct.result
+share/mysql-test/r/big_test.require
+share/mysql-test/r/bigint.result
+share/mysql-test/r/binary.result
+share/mysql-test/r/bool.result
+share/mysql-test/r/bulk_replace.result
+share/mysql-test/r/case.result
+share/mysql-test/r/cast.result
+share/mysql-test/r/check.result
+share/mysql-test/r/check_var_limit.require
+share/mysql-test/r/comments.result
+share/mysql-test/r/compare.result
+share/mysql-test/r/connect.result
+share/mysql-test/r/constraints.result
+share/mysql-test/r/count_distinct.result
+share/mysql-test/r/count_distinct2.result
+share/mysql-test/r/count_distinct3.result
+share/mysql-test/r/create.result
+share/mysql-test/r/create_select_tmp.result
+share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_big5.result
+share/mysql-test/r/ctype_collate.result
+share/mysql-test/r/ctype_cp1251.result
+share/mysql-test/r/ctype_create.result
+share/mysql-test/r/ctype_latin1.result
+share/mysql-test/r/ctype_latin1_de.result
+share/mysql-test/r/ctype_many.result
+share/mysql-test/r/ctype_mb.result
+share/mysql-test/r/ctype_recoding.result
+share/mysql-test/r/ctype_sjis.result
+share/mysql-test/r/ctype_tis620.result
+share/mysql-test/r/ctype_uca.result
+share/mysql-test/r/ctype_ucs.result
+share/mysql-test/r/ctype_ujis.result
+share/mysql-test/r/ctype_utf8.result
+share/mysql-test/r/date_formats.result
+share/mysql-test/r/delayed.result
+share/mysql-test/r/delete.result
+share/mysql-test/r/derived.result
+share/mysql-test/r/dirty_close.result
+share/mysql-test/r/distinct.result
+share/mysql-test/r/drop.result
+share/mysql-test/r/drop_temp_table.result
+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/explain.result
+share/mysql-test/r/flush.result
+share/mysql-test/r/flush_block_commit.result
+share/mysql-test/r/flush_table.result
+share/mysql-test/r/foreign_key.result
+share/mysql-test/r/fulltext.result
+share/mysql-test/r/fulltext2.result
+share/mysql-test/r/fulltext_cache.result
+share/mysql-test/r/fulltext_distinct.result
+share/mysql-test/r/fulltext_left_join.result
+share/mysql-test/r/fulltext_multi.result
+share/mysql-test/r/fulltext_order_by.result
+share/mysql-test/r/fulltext_update.result
+share/mysql-test/r/fulltext_var.result
+share/mysql-test/r/func_compress.result
+share/mysql-test/r/func_concat.result
+share/mysql-test/r/func_crypt.result
+share/mysql-test/r/func_date_add.result
+share/mysql-test/r/func_default.result
+share/mysql-test/r/func_encrypt.result
+share/mysql-test/r/func_equal.result
+share/mysql-test/r/func_gconcat.result
+share/mysql-test/r/func_group.result
+share/mysql-test/r/func_if.result
+share/mysql-test/r/func_in.result
+share/mysql-test/r/func_isnull.result
+share/mysql-test/r/func_like.result
+share/mysql-test/r/func_math.result
+share/mysql-test/r/func_misc.result
+share/mysql-test/r/func_op.result
+share/mysql-test/r/func_regexp.result
+share/mysql-test/r/func_sapdb.result
+share/mysql-test/r/func_set.result
+share/mysql-test/r/func_str.result
+share/mysql-test/r/func_system.result
+share/mysql-test/r/func_test.result
+share/mysql-test/r/func_time.result
+share/mysql-test/r/func_timestamp.result
+share/mysql-test/r/gcc296.result
+share/mysql-test/r/gis-rtree.result
+share/mysql-test/r/gis.result
+share/mysql-test/r/grant.result
+share/mysql-test/r/grant2.result
+share/mysql-test/r/grant_cache.result
+share/mysql-test/r/group_by.result
+share/mysql-test/r/handler.result
+share/mysql-test/r/have_archive.require
+share/mysql-test/r/have_bdb.require
+share/mysql-test/r/have_big5.require
+share/mysql-test/r/have_compress.require
+share/mysql-test/r/have_crypt.require
+share/mysql-test/r/have_csv.require
+share/mysql-test/r/have_debug.require
+share/mysql-test/r/have_exampledb.require
+share/mysql-test/r/have_geometry.require
+share/mysql-test/r/have_innodb.require
+share/mysql-test/r/have_isam.require
+share/mysql-test/r/have_met_timezone.require
+share/mysql-test/r/have_ndb.require
+share/mysql-test/r/have_openssl.require
+share/mysql-test/r/have_openssl_1.require
+share/mysql-test/r/have_query_cache.require
+share/mysql-test/r/have_raid.require
+share/mysql-test/r/have_sjis.require
+share/mysql-test/r/have_symlink.require
+share/mysql-test/r/have_tis620.require
+share/mysql-test/r/have_ucs2.require
+share/mysql-test/r/have_ujis.require
+share/mysql-test/r/having.result
+share/mysql-test/r/heap.result
+share/mysql-test/r/heap_auto_increment.result
+share/mysql-test/r/heap_btree.result
+share/mysql-test/r/heap_hash.result
+share/mysql-test/r/help.result
+share/mysql-test/r/init_connect.result
+share/mysql-test/r/innodb-deadlock.result
+share/mysql-test/r/innodb-lock.result
+share/mysql-test/r/innodb.result
+share/mysql-test/r/innodb_cache.result
+share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/insert.result
+share/mysql-test/r/insert_select.result
+share/mysql-test/r/insert_update.result
+share/mysql-test/r/isam.result
+share/mysql-test/r/join.result
+share/mysql-test/r/join_crash.result
+share/mysql-test/r/join_outer.result
+share/mysql-test/r/key.result
+share/mysql-test/r/key_cache.result
+share/mysql-test/r/key_diff.result
+share/mysql-test/r/key_primary.result
+share/mysql-test/r/keywords.result
+share/mysql-test/r/kill.result
+share/mysql-test/r/limit.result
+share/mysql-test/r/loaddata.result
+share/mysql-test/r/lock.result
+share/mysql-test/r/lock_multi.result
+share/mysql-test/r/lock_tables_lost_commit.result
+share/mysql-test/r/lowercase0.require
+share/mysql-test/r/lowercase2.require
+share/mysql-test/r/lowercase_table.result
+share/mysql-test/r/lowercase_table2.result
+share/mysql-test/r/lowercase_table3.result
+share/mysql-test/r/lowercase_table_qcache.result
+share/mysql-test/r/merge.result
+share/mysql-test/r/metadata.result
+share/mysql-test/r/mix_innodb_myisam_binlog.result
+share/mysql-test/r/multi_statement.result
+share/mysql-test/r/multi_update.result
+share/mysql-test/r/myisam-blob.result
+share/mysql-test/r/myisam.result
+share/mysql-test/r/mysql_protocols.result
+share/mysql-test/r/mysqlbinlog.result
+share/mysql-test/r/mysqlbinlog2.result
+share/mysql-test/r/mysqldump.result
+share/mysql-test/r/mysqltest.result
+share/mysql-test/r/ndb_alter_table.result
+share/mysql-test/r/ndb_autodiscover.result
+share/mysql-test/r/ndb_autodiscover2.result
+share/mysql-test/r/ndb_basic.result
+share/mysql-test/r/ndb_blob.result
+share/mysql-test/r/ndb_cache.result
+share/mysql-test/r/ndb_charset.result
+share/mysql-test/r/ndb_index.result
+share/mysql-test/r/ndb_index_ordered.result
+share/mysql-test/r/ndb_index_unique.result
+share/mysql-test/r/ndb_insert.result
+share/mysql-test/r/ndb_limit.result
+share/mysql-test/r/ndb_lock.result
+share/mysql-test/r/ndb_minmax.result
+share/mysql-test/r/ndb_replace.result
+share/mysql-test/r/ndb_subquery.result
+share/mysql-test/r/ndb_transaction.result
+share/mysql-test/r/ndb_truncate.result
+share/mysql-test/r/ndb_types.result
+share/mysql-test/r/negation_elimination.result
+share/mysql-test/r/not_embedded.require
+share/mysql-test/r/null.result
+share/mysql-test/r/null_key.result
+share/mysql-test/r/odbc.result
+share/mysql-test/r/olap.result
+share/mysql-test/r/openssl_1.result
+share/mysql-test/r/openssl_2.result
+share/mysql-test/r/order_by.result
+share/mysql-test/r/order_fill_sortbuf.result
+share/mysql-test/r/outfile.result
+share/mysql-test/r/overflow.result
+share/mysql-test/r/packet.result
+share/mysql-test/r/preload.result
+share/mysql-test/r/ps.result
+share/mysql-test/r/ps_10nestset.result
+share/mysql-test/r/ps_11bugs.result
+share/mysql-test/r/ps_1general.result
+share/mysql-test/r/ps_2myisam.result
+share/mysql-test/r/ps_3innodb.result
+share/mysql-test/r/ps_4heap.result
+share/mysql-test/r/ps_5merge.result
+share/mysql-test/r/ps_6bdb.result
+share/mysql-test/r/ps_7ndb.result
+share/mysql-test/r/query_cache.result
+share/mysql-test/r/query_cache_merge.result
+share/mysql-test/r/raid.result
+share/mysql-test/r/range.result
+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/row.result
+share/mysql-test/r/rpl000001.result
+share/mysql-test/r/rpl000002.result
+share/mysql-test/r/rpl000004.result
+share/mysql-test/r/rpl000005.result
+share/mysql-test/r/rpl000006.result
+share/mysql-test/r/rpl000008.result
+share/mysql-test/r/rpl000009.result
+share/mysql-test/r/rpl000010.result
+share/mysql-test/r/rpl000011.result
+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_chain_temp_table.result
+share/mysql-test/r/rpl_change_master.result
+share/mysql-test/r/rpl_charset.result
+share/mysql-test/r/rpl_commit_after_flush.result
+share/mysql-test/r/rpl_delete_all.result
+share/mysql-test/r/rpl_do_grant.result
+share/mysql-test/r/rpl_drop.result
+share/mysql-test/r/rpl_empty_master_crash.result
+share/mysql-test/r/rpl_error_ignored_table.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_init_slave.result
+share/mysql-test/r/rpl_insert_id.result
+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_log.result
+share/mysql-test/r/rpl_log_pos.result
+share/mysql-test/r/rpl_master_pos_wait.result
+share/mysql-test/r/rpl_max_relay_size.result
+share/mysql-test/r/rpl_misc_functions.result
+share/mysql-test/r/rpl_multi_delete.result
+share/mysql-test/r/rpl_multi_delete2.result
+share/mysql-test/r/rpl_multi_update.result
+share/mysql-test/r/rpl_mystery22.result
+share/mysql-test/r/rpl_openssl.result
+share/mysql-test/r/rpl_optimize.result
+share/mysql-test/r/rpl_ps.result
+share/mysql-test/r/rpl_redirect.result
+share/mysql-test/r/rpl_relayrotate.result
+share/mysql-test/r/rpl_relayspace.result
+share/mysql-test/r/rpl_replicate_do.result
+share/mysql-test/r/rpl_reset_slave.result
+share/mysql-test/r/rpl_rotate_logs.result
+share/mysql-test/r/rpl_server_id1.result
+share/mysql-test/r/rpl_server_id2.result
+share/mysql-test/r/rpl_set_charset.result
+share/mysql-test/r/rpl_skip_error.result
+share/mysql-test/r/rpl_sporadic_master.result
+share/mysql-test/r/rpl_temporary.result
+share/mysql-test/r/rpl_timezone.result
+share/mysql-test/r/rpl_trunc_binlog.result
+share/mysql-test/r/rpl_until.result
+share/mysql-test/r/rpl_user_variables.result
+share/mysql-test/r/select.result
+share/mysql-test/r/select_found.result
+share/mysql-test/r/select_safe.result
+share/mysql-test/r/show_check.result
+share/mysql-test/r/slave-running.result
+share/mysql-test/r/slave-stopped.result
+share/mysql-test/r/sql_mode.result
+share/mysql-test/r/status.result
+share/mysql-test/r/subselect.result
+share/mysql-test/r/subselect2.result
+share/mysql-test/r/subselect_gis.result
+share/mysql-test/r/subselect_innodb.result
+share/mysql-test/r/symlink.result
+share/mysql-test/r/synchronization.result
+share/mysql-test/r/system_mysql_db.result
+share/mysql-test/r/system_mysql_db_refs.result
+share/mysql-test/r/tablelock.result
+share/mysql-test/r/temp_table.result
+share/mysql-test/r/timezone.result
+share/mysql-test/r/timezone2.result
+share/mysql-test/r/true.require
+share/mysql-test/r/truncate.result
+share/mysql-test/r/type_blob.result
+share/mysql-test/r/type_date.result
+share/mysql-test/r/type_datetime.result
+share/mysql-test/r/type_decimal.result
+share/mysql-test/r/type_enum.result
+share/mysql-test/r/type_float.result
+share/mysql-test/r/type_nchar.result
+share/mysql-test/r/type_ranges.result
+share/mysql-test/r/type_set.result
+share/mysql-test/r/type_time.result
+share/mysql-test/r/type_timestamp.result
+share/mysql-test/r/type_uint.result
+share/mysql-test/r/type_year.result
+share/mysql-test/r/union.result
+share/mysql-test/r/update.result
+share/mysql-test/r/user_var.result
+share/mysql-test/r/varbinary.result
+share/mysql-test/r/variables.result
+share/mysql-test/r/warnings.result
+share/mysql-test/std_data/cacert.pem
+share/mysql-test/std_data/client-cert.pem
+share/mysql-test/std_data/client-key.pem
+share/mysql-test/std_data/des_key_file
+share/mysql-test/std_data/init_file.dat
+share/mysql-test/std_data/loaddata1.dat
+share/mysql-test/std_data/loaddata2.dat
+share/mysql-test/std_data/loaddata3.dat
+share/mysql-test/std_data/loaddata4.dat
+share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/rpl_loaddata.dat
+share/mysql-test/std_data/rpl_loaddata2.dat
+share/mysql-test/std_data/trunc_binlog.000001
+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.test
+share/mysql-test/t/analyse.test
+share/mysql-test/t/ansi.test
+share/mysql-test/t/archive.test
+share/mysql-test/t/auto_increment.test
+share/mysql-test/t/backup-master.sh
+share/mysql-test/t/backup.test
+share/mysql-test/t/bdb-alter-table-1.test
+share/mysql-test/t/bdb-alter-table-2-master.opt
+share/mysql-test/t/bdb-alter-table-2.test
+share/mysql-test/t/bdb-crash.test
+share/mysql-test/t/bdb-deadlock.test
+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/bench_count_distinct.test
+share/mysql-test/t/bigint.test
+share/mysql-test/t/binary.test
+share/mysql-test/t/bool.test
+share/mysql-test/t/bulk_replace.test
+share/mysql-test/t/case.test
+share/mysql-test/t/cast.test
+share/mysql-test/t/check.test
+share/mysql-test/t/client_test.test
+share/mysql-test/t/comments.test
+share/mysql-test/t/compare.test
+share/mysql-test/t/connect.test
+share/mysql-test/t/constraints.test
+share/mysql-test/t/count_distinct.test
+share/mysql-test/t/count_distinct2-master.opt
+share/mysql-test/t/count_distinct2.test
+share/mysql-test/t/count_distinct3.test
+share/mysql-test/t/create.test
+share/mysql-test/t/create_select_tmp.test
+share/mysql-test/t/csv.test
+share/mysql-test/t/ctype_big5.test
+share/mysql-test/t/ctype_collate.test
+share/mysql-test/t/ctype_cp1251-master.opt
+share/mysql-test/t/ctype_cp1251.test
+share/mysql-test/t/ctype_create.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
+share/mysql-test/t/ctype_many.test
+share/mysql-test/t/ctype_mb.test
+share/mysql-test/t/ctype_recoding.test
+share/mysql-test/t/ctype_sjis.test
+share/mysql-test/t/ctype_tis620.test
+share/mysql-test/t/ctype_uca.test
+share/mysql-test/t/ctype_ucs.test
+share/mysql-test/t/ctype_ujis.test
+share/mysql-test/t/ctype_utf8.test
+share/mysql-test/t/date_formats-master.opt
+share/mysql-test/t/date_formats.test
+share/mysql-test/t/delayed.test
+share/mysql-test/t/delete.test
+share/mysql-test/t/derived.test
+share/mysql-test/t/dirty_close.test
+share/mysql-test/t/distinct.test
+share/mysql-test/t/drop.test
+share/mysql-test/t/drop_temp_table.test
+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/explain.test
+share/mysql-test/t/flush.test
+share/mysql-test/t/flush_block_commit.test
+share/mysql-test/t/flush_table.test
+share/mysql-test/t/foreign_key.test
+share/mysql-test/t/fulltext.test
+share/mysql-test/t/fulltext2.test
+share/mysql-test/t/fulltext_cache.test
+share/mysql-test/t/fulltext_distinct.test
+share/mysql-test/t/fulltext_left_join.test
+share/mysql-test/t/fulltext_multi.test
+share/mysql-test/t/fulltext_order_by.test
+share/mysql-test/t/fulltext_update.test
+share/mysql-test/t/fulltext_var.test
+share/mysql-test/t/func_compress.test
+share/mysql-test/t/func_concat.test
+share/mysql-test/t/func_crypt.test
+share/mysql-test/t/func_date_add.test
+share/mysql-test/t/func_default.test
+share/mysql-test/t/func_encrypt-master.opt
+share/mysql-test/t/func_encrypt.test
+share/mysql-test/t/func_equal.test
+share/mysql-test/t/func_gconcat.test
+share/mysql-test/t/func_group.test
+share/mysql-test/t/func_if.test
+share/mysql-test/t/func_in.test
+share/mysql-test/t/func_isnull.test
+share/mysql-test/t/func_like.test
+share/mysql-test/t/func_math.test
+share/mysql-test/t/func_misc.test
+share/mysql-test/t/func_op.test
+share/mysql-test/t/func_regexp.test
+share/mysql-test/t/func_sapdb.test
+share/mysql-test/t/func_set.test
+share/mysql-test/t/func_str.test
+share/mysql-test/t/func_system.test
+share/mysql-test/t/func_test.test
+share/mysql-test/t/func_time.test
+share/mysql-test/t/func_timestamp.test
+share/mysql-test/t/gcc296.test
+share/mysql-test/t/gis-rtree.test
+share/mysql-test/t/gis.test
+share/mysql-test/t/grant.test
+share/mysql-test/t/grant2.test
+share/mysql-test/t/grant_cache-master.opt
+share/mysql-test/t/grant_cache.test
+share/mysql-test/t/group_by.test
+share/mysql-test/t/handler.test
+share/mysql-test/t/having.test
+share/mysql-test/t/heap.test
+share/mysql-test/t/heap_auto_increment.test
+share/mysql-test/t/heap_btree.test
+share/mysql-test/t/heap_hash.test
+share/mysql-test/t/help.test
+share/mysql-test/t/init_connect-master.opt
+share/mysql-test/t/init_connect.test
+share/mysql-test/t/init_file-master.opt
+share/mysql-test/t/init_file.test
+share/mysql-test/t/innodb-deadlock.test
+share/mysql-test/t/innodb-lock-master.opt
+share/mysql-test/t/innodb-lock.test
+share/mysql-test/t/innodb-master.opt
+share/mysql-test/t/innodb.test
+share/mysql-test/t/innodb_cache-master.opt
+share/mysql-test/t/innodb_cache.test
+share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/insert.test
+share/mysql-test/t/insert_select.test
+share/mysql-test/t/insert_update.test
+share/mysql-test/t/isam.test
+share/mysql-test/t/join.test
+share/mysql-test/t/join_crash.test
+share/mysql-test/t/join_outer.test
+share/mysql-test/t/key.test
+share/mysql-test/t/key_cache-master.opt
+share/mysql-test/t/key_cache.test
+share/mysql-test/t/key_diff.test
+share/mysql-test/t/key_primary.test
+share/mysql-test/t/keywords.test
+share/mysql-test/t/kill.test
+share/mysql-test/t/limit.test
+share/mysql-test/t/loaddata.test
+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/lowercase_table-master.opt
+share/mysql-test/t/lowercase_table.test
+share/mysql-test/t/lowercase_table2.test
+share/mysql-test/t/lowercase_table3-master.opt
+share/mysql-test/t/lowercase_table3.test
+share/mysql-test/t/lowercase_table_qcache-master.opt
+share/mysql-test/t/lowercase_table_qcache.test
+share/mysql-test/t/merge.test
+share/mysql-test/t/metadata.test
+share/mysql-test/t/mix_innodb_myisam_binlog.test
+share/mysql-test/t/multi_statement.test
+share/mysql-test/t/multi_update-master.opt
+share/mysql-test/t/multi_update.test
+share/mysql-test/t/myisam-blob-master.opt
+share/mysql-test/t/myisam-blob.test
+share/mysql-test/t/myisam.test
+share/mysql-test/t/mysql_protocols.test
+share/mysql-test/t/mysqlbinlog-master.opt
+share/mysql-test/t/mysqlbinlog.test
+share/mysql-test/t/mysqlbinlog2.test
+share/mysql-test/t/mysqldump.test
+share/mysql-test/t/mysqltest.test
+share/mysql-test/t/ndb_alter_table.test
+share/mysql-test/t/ndb_autodiscover.test
+share/mysql-test/t/ndb_autodiscover2-master.opt
+share/mysql-test/t/ndb_autodiscover2.test
+share/mysql-test/t/ndb_basic.test
+share/mysql-test/t/ndb_blob.test
+share/mysql-test/t/ndb_cache.test
+share/mysql-test/t/ndb_charset.test
+share/mysql-test/t/ndb_index.test
+share/mysql-test/t/ndb_index_ordered.test
+share/mysql-test/t/ndb_index_unique.test
+share/mysql-test/t/ndb_insert.test
+share/mysql-test/t/ndb_limit.test
+share/mysql-test/t/ndb_lock.test
+share/mysql-test/t/ndb_minmax.test
+share/mysql-test/t/ndb_replace.test
+share/mysql-test/t/ndb_subquery.test
+share/mysql-test/t/ndb_transaction.test
+share/mysql-test/t/ndb_truncate.test
+share/mysql-test/t/ndb_types.test
+share/mysql-test/t/negation_elimination.test
+share/mysql-test/t/null.test
+share/mysql-test/t/null_key.test
+share/mysql-test/t/odbc.test
+share/mysql-test/t/olap.test
+share/mysql-test/t/openssl_1.test
+share/mysql-test/t/order_by.test
+share/mysql-test/t/order_fill_sortbuf-master.opt
+share/mysql-test/t/order_fill_sortbuf.test
+share/mysql-test/t/outfile.test
+share/mysql-test/t/overflow.test
+share/mysql-test/t/packet.test
+share/mysql-test/t/preload.test
+share/mysql-test/t/ps.test
+share/mysql-test/t/ps_10nestset.test
+share/mysql-test/t/ps_11bugs.test
+share/mysql-test/t/ps_1general.test
+share/mysql-test/t/ps_2myisam.test
+share/mysql-test/t/ps_3innodb.test
+share/mysql-test/t/ps_4heap.test
+share/mysql-test/t/ps_5merge.test
+share/mysql-test/t/ps_6bdb.test
+share/mysql-test/t/ps_7ndb.test
+share/mysql-test/t/query_cache.test
+share/mysql-test/t/query_cache_merge.test
+share/mysql-test/t/raid.test
+share/mysql-test/t/range.test
+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/row.test
+share/mysql-test/t/rpl000001-slave.opt
+share/mysql-test/t/rpl000001.test
+share/mysql-test/t/rpl000002.test
+share/mysql-test/t/rpl000004.test
+share/mysql-test/t/rpl000005.test
+share/mysql-test/t/rpl000006.test
+share/mysql-test/t/rpl000008-slave.opt
+share/mysql-test/t/rpl000008.test
+share/mysql-test/t/rpl000009-slave.opt
+share/mysql-test/t/rpl000009.test
+share/mysql-test/t/rpl000010-slave.opt
+share/mysql-test/t/rpl000010.test
+share/mysql-test/t/rpl000011.test
+share/mysql-test/t/rpl000012.test
+share/mysql-test/t/rpl000013-slave.opt
+share/mysql-test/t/rpl000013.test
+share/mysql-test/t/rpl000015-slave.sh
+share/mysql-test/t/rpl000015.slave-mi
+share/mysql-test/t/rpl000015.test
+share/mysql-test/t/rpl000017-slave.opt
+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_chain_temp_table.test
+share/mysql-test/t/rpl_change_master.test
+share/mysql-test/t/rpl_charset.test
+share/mysql-test/t/rpl_commit_after_flush.test
+share/mysql-test/t/rpl_delete_all.test
+share/mysql-test/t/rpl_do_grant.test
+share/mysql-test/t/rpl_drop.test
+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_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
+share/mysql-test/t/rpl_flush_log_loop-slave.sh
+share/mysql-test/t/rpl_flush_log_loop.test
+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_init_slave-slave.opt
+share/mysql-test/t/rpl_init_slave.test
+share/mysql-test/t/rpl_insert_id-slave.opt
+share/mysql-test/t/rpl_insert_id.test
+share/mysql-test/t/rpl_loaddata.test
+share/mysql-test/t/rpl_loaddata_rule_m-master.opt
+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_log-master.opt
+share/mysql-test/t/rpl_log-slave.opt
+share/mysql-test/t/rpl_log.test
+share/mysql-test/t/rpl_log_pos.test
+share/mysql-test/t/rpl_master_pos_wait.test
+share/mysql-test/t/rpl_max_relay_size.test
+share/mysql-test/t/rpl_misc_functions-slave.sh
+share/mysql-test/t/rpl_misc_functions.test
+share/mysql-test/t/rpl_multi_delete-slave.opt
+share/mysql-test/t/rpl_multi_delete.test
+share/mysql-test/t/rpl_multi_delete2-slave.opt
+share/mysql-test/t/rpl_multi_delete2.test
+share/mysql-test/t/rpl_multi_update.test
+share/mysql-test/t/rpl_mystery22.test
+share/mysql-test/t/rpl_openssl.test
+share/mysql-test/t/rpl_optimize.test
+share/mysql-test/t/rpl_ps.test
+share/mysql-test/t/rpl_redirect.test
+share/mysql-test/t/rpl_relayrotate-slave.opt
+share/mysql-test/t/rpl_relayrotate.test
+share/mysql-test/t/rpl_relayspace-slave.opt
+share/mysql-test/t/rpl_relayspace.test
+share/mysql-test/t/rpl_replicate_do-slave.opt
+share/mysql-test/t/rpl_replicate_do.test
+share/mysql-test/t/rpl_reset_slave.test
+share/mysql-test/t/rpl_rotate_logs-master.opt
+share/mysql-test/t/rpl_rotate_logs-slave.sh
+share/mysql-test/t/rpl_rotate_logs.slave-mi
+share/mysql-test/t/rpl_rotate_logs.test
+share/mysql-test/t/rpl_server_id1.test
+share/mysql-test/t/rpl_server_id2-slave.opt
+share/mysql-test/t/rpl_server_id2.test
+share/mysql-test/t/rpl_set_charset.test
+share/mysql-test/t/rpl_skip_error-slave.opt
+share/mysql-test/t/rpl_skip_error.test
+share/mysql-test/t/rpl_sporadic_master-master.opt
+share/mysql-test/t/rpl_sporadic_master.test
+share/mysql-test/t/rpl_temporary.test
+share/mysql-test/t/rpl_timezone-master.opt
+share/mysql-test/t/rpl_timezone-slave.opt
+share/mysql-test/t/rpl_timezone.test
+share/mysql-test/t/rpl_trunc_binlog.test
+share/mysql-test/t/rpl_until.test
+share/mysql-test/t/rpl_user_variables.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.test
+share/mysql-test/t/sql_mode.test
+share/mysql-test/t/status.test
+share/mysql-test/t/subselect.test
+share/mysql-test/t/subselect2.test
+share/mysql-test/t/subselect_gis.test
+share/mysql-test/t/subselect_innodb.test
+share/mysql-test/t/symlink.test
+share/mysql-test/t/synchronization.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_refs.test
+share/mysql-test/t/tablelock.test
+share/mysql-test/t/temp_table.test
+share/mysql-test/t/timezone-master.opt
+share/mysql-test/t/timezone.test
+share/mysql-test/t/timezone2.test
+share/mysql-test/t/truncate.test
+share/mysql-test/t/type_blob.test
+share/mysql-test/t/type_date.test
+share/mysql-test/t/type_datetime.test
+share/mysql-test/t/type_decimal.test
+share/mysql-test/t/type_enum.test
+share/mysql-test/t/type_float.test
+share/mysql-test/t/type_nchar.test
+share/mysql-test/t/type_ranges.test
+share/mysql-test/t/type_set.test
+share/mysql-test/t/type_time.test
+share/mysql-test/t/type_timestamp.test
+share/mysql-test/t/type_uint.test
+share/mysql-test/t/type_year.test
+share/mysql-test/t/union-master.opt
+share/mysql-test/t/union.test
+share/mysql-test/t/update.test
+share/mysql-test/t/user_var.test
+share/mysql-test/t/varbinary.test
+share/mysql-test/t/variables-master.opt
+share/mysql-test/t/variables.test
+share/mysql-test/t/warnings-master.opt
+share/mysql-test/t/warnings.test
+share/mysql/charsets/Index.xml
 share/mysql/charsets/README
-share/mysql/charsets/cp1251.conf
-share/mysql/charsets/cp1257.conf
-share/mysql/charsets/croat.conf
-share/mysql/charsets/danish.conf
-share/mysql/charsets/dec8.conf
-share/mysql/charsets/dos.conf
-share/mysql/charsets/estonia.conf
-share/mysql/charsets/german1.conf
-share/mysql/charsets/greek.conf
-share/mysql/charsets/hebrew.conf
-share/mysql/charsets/hp8.conf
-share/mysql/charsets/hungarian.conf
-share/mysql/charsets/koi8_ru.conf
-share/mysql/charsets/koi8_ukr.conf
-share/mysql/charsets/latin1.conf
-share/mysql/charsets/latin2.conf
-share/mysql/charsets/latin5.conf
-share/mysql/charsets/swe7.conf
-share/mysql/charsets/usa7.conf
-share/mysql/charsets/win1250.conf
-share/mysql/charsets/win1251.conf
-share/mysql/charsets/win1251ukr.conf
+share/mysql/charsets/armscii8.xml
+share/mysql/charsets/ascii.xml
+share/mysql/charsets/cp1250.xml
+share/mysql/charsets/cp1251.xml
+share/mysql/charsets/cp1256.xml
+share/mysql/charsets/cp1257.xml
+share/mysql/charsets/cp850.xml
+share/mysql/charsets/cp852.xml
+share/mysql/charsets/cp866.xml
+share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
+share/mysql/charsets/greek.xml
+share/mysql/charsets/hebrew.xml
+share/mysql/charsets/hp8.xml
+share/mysql/charsets/keybcs2.xml
+share/mysql/charsets/koi8r.xml
+share/mysql/charsets/koi8u.xml
+share/mysql/charsets/latin1.xml
+share/mysql/charsets/latin2.xml
+share/mysql/charsets/latin5.xml
+share/mysql/charsets/latin7.xml
+share/mysql/charsets/macce.xml
+share/mysql/charsets/macroman.xml
+share/mysql/charsets/swe7.xml
 share/mysql/czech/errmsg.sys
 share/mysql/czech/errmsg.txt
 share/mysql/danish/errmsg.sys
@@ -93,6 +853,8 @@ share/mysql/romanian/errmsg.sys
 share/mysql/romanian/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/serbian/errmsg.sys
+share/mysql/serbian/errmsg.txt
 share/mysql/slovak/errmsg.sys
 share/mysql/slovak/errmsg.txt
 share/mysql/spanish/errmsg.sys
@@ -105,6 +867,7 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql/swedish
 @dirrm share/mysql/spanish
 @dirrm share/mysql/slovak
+@dirrm share/mysql/serbian
 @dirrm share/mysql/russian
 @dirrm share/mysql/romanian
 @dirrm share/mysql/portuguese
@@ -124,3 +887,8 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql/danish
 @dirrm share/mysql/czech
 @dirrm share/mysql/charsets
+@dirrm share/mysql-test/t
+@dirrm share/mysql-test/std_data
+@dirrm share/mysql-test/r
+@dirrm share/mysql-test/include
+@dirrm share/mysql-test