mysql 5.5.24-1 màj port

5 files changed, 180 insertions, 33 deletions

diff --git a/mysql/.footprint.i686 b/mysql/.footprint.i686
index 53113841c..58022f369 100644
--- a/mysql/.footprint.i686
+++ b/mysql/.footprint.i686
@@ -17,7 +17,7 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34mysql -> ../init.d/mysql
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
 drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	srv/
 drwx------	root/root	srv/mysql/
@@ -136,7 +136,6 @@ drwxr-xr-x	root/root	usr/mysql-test/extra/rpl_tests/
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
--rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_id.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_ignore.test
@@ -345,6 +344,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/is_embedded.inc
 -rw-r--r--	root/root	usr/mysql-test/include/kill_query.inc
 -rw-r--r--	root/root	usr/mysql-test/include/kill_query_and_diff_master_slave.inc
+-rw-r--r--	root/root	usr/mysql-test/include/libdaemon_example.ini
 -rw-r--r--	root/root	usr/mysql-test/include/linux_sys_vars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/load_sysvars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/loaddata_autocom.inc
@@ -402,6 +402,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/query_cache.inc
 -rw-r--r--	root/root	usr/mysql-test/include/query_cache_sql_prepare.inc
 -rw-r--r--	root/root	usr/mysql-test/include/read_many_rows.inc
+-rw-r--r--	root/root	usr/mysql-test/include/relocate_binlogs.inc
 -rw-r--r--	root/root	usr/mysql-test/include/report-features.test
 -rw-r--r--	root/root	usr/mysql-test/include/restart_mysqld.inc
 -rw-r--r--	root/root	usr/mysql-test/include/restart_slave_sql.inc
@@ -454,6 +455,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/show_msg80.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_relaylog_events.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_rpl_debug_info.inc
+-rw-r--r--	root/root	usr/mysql-test/include/show_slave_hosts.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_slave_status.inc
 -rw-r--r--	root/root	usr/mysql-test/include/sp-vars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/start_slave.inc
@@ -567,6 +569,7 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/archive_debug.result
 -rw-r--r--	root/root	usr/mysql-test/r/archive_gis.result
 -rw-r--r--	root/root	usr/mysql-test/r/archive_plugin.result
+-rw-r--r--	root/root	usr/mysql-test/r/auth_rpl.result
 -rw-r--r--	root/root	usr/mysql-test/r/auto_increment.result
 -rw-r--r--	root/root	usr/mysql-test/r/backup.result
 -rw-r--r--	root/root	usr/mysql-test/r/bench_count_distinct.result
@@ -574,9 +577,11 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/bigint.result
 -rw-r--r--	root/root	usr/mysql-test/r/binary.result
 -rw-r--r--	root/root	usr/mysql-test/r/binlog_tx_isolation.result
+-rw-r--r--	root/root	usr/mysql-test/r/blackhole.result
 -rw-r--r--	root/root	usr/mysql-test/r/blackhole_plugin.result
 -rw-r--r--	root/root	usr/mysql-test/r/bool.result
 -rw-r--r--	root/root	usr/mysql-test/r/bootstrap.result
+-rw-r--r--	root/root	usr/mysql-test/r/bug13633383.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug39022.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug46080.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug46261.result
@@ -986,6 +991,7 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/partition_binlog_stmt.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_blackhole.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_bug18198.result
+-rw-r--r--	root/root	usr/mysql-test/r/partition_cache.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_charset.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_column.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_column_prune.result
@@ -1209,6 +1215,7 @@ drwxr-xr-x	root/root	usr/mysql-test/std_data/
 -rw-r--r--	root/root	usr/mysql-test/std_data/bad_gis_data.dat
 -rw-r--r--	root/root	usr/mysql-test/std_data/binlog_savepoint.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/binlog_transaction.000001
+-rw-r--r--	root/root	usr/mysql-test/std_data/bug11747416_32228_binlog.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug15328.cnf
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug16266.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug19371.MYD
@@ -1237,7 +1244,6 @@ drwxr-xr-x	root/root	usr/mysql-test/std_data/
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.CSM
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.CSV
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.frm
--rw-r--r--	root/root	usr/mysql-test/std_data/bug57108.cnf
 -rw-r--r--	root/root	usr/mysql-test/std_data/cacert.pem
 -rw-r--r--	root/root	usr/mysql-test/std_data/charset_utf8.txt
 -rw-r--r--	root/root	usr/mysql-test/std_data/checkDBI_DBD-mysql.pl
@@ -2460,7 +2466,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/federated/
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin-master.opt
--rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.result (EMPTY)
+-rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.test
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_server.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_server.test
@@ -2826,8 +2832,6 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/funcs_2/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/funcs_2/t/myisam_charset.test
 -rw-r--r--	root/root	usr/mysql-test/suite/funcs_2/t/suite.opt
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/
-drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/include/
--rw-r--r--	root/root	usr/mysql-test/suite/innodb/include/innodb-index.inc
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-analyze.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-18274.result
@@ -2835,6 +2839,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-56228.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-blob.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-consistent.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-create-options.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-index.result
@@ -2849,6 +2854,12 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-zip.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug11754376.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug11766634.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug12400341.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug12661768.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug13510739.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug13635833.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug21704.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug30423.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -2899,19 +2910,25 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59307.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59410.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59641.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59733.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60049.result
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60196.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60229.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_file_format.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_gis.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_index_large_prefix.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_information_schema.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_misc1.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_multi_update.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_mysql.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_notembedded.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_replace.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_trx_weight.result
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
@@ -2925,6 +2942,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-blob.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-consistent-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-consistent.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-create-options.test
@@ -2944,6 +2962,14 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11754376.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11766634-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11766634.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12400341.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12661768.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug13510739.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug13635833.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug21704.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug30423.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@@ -2969,6 +2995,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug45357.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug46000.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug46676.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47167-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47167.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47621.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47622.test
@@ -2999,16 +3026,25 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59307.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59410.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59641.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59733.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60049-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60049.test
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60196.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60229.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_file_format-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_file_format.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_gis.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_index_large_prefix.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_information_schema.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_misc1-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_misc1.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_multi_update.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_mysql-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_mysql.test
@@ -3017,6 +3053,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_notembedded.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_replace.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -3759,6 +3796,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_errors.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_grant.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_index.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bit_npk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_blackhole.result
@@ -3768,6 +3806,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug37426.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug38694.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug41902.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_change_master.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_charset.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_charset_sjis.result
@@ -3776,6 +3815,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_commit_after_flush.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_concurrency_error.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_conditional_comments.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_connection.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_database.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
@@ -3826,11 +3866,9 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert.result
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_duplicate.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_id.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_id_pk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_ignore.result
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_select.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_invoked_features.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ip_mix.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ip_mix2.result
@@ -3891,8 +3929,10 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_replicate_do.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_report.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_report_port.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rewrt_db.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rotate_logs.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_4_bytes.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_NOW.result
@@ -3914,6 +3954,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_find_row.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_func001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_func002.result
@@ -3927,6 +3968,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_log.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_merge_engine.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_multi_query.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
@@ -3986,6 +4028,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_sporadic_master.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ssl.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ssl1.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_000001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
@@ -4005,6 +4048,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_multi_query.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_no_op.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
@@ -4058,6 +4102,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_errors.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_grant.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_index.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bit.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bit_npk.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -4070,6 +4115,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug38694.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug41902.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_change_master.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_charset.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_charset_sjis.test
@@ -4080,6 +4126,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_concurrency_error.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_conditional_comments.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_connection.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database.test
@@ -4156,11 +4203,9 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert.test
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_duplicate.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_id.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_ignore.test
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_select.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_invoked_features.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt
@@ -4253,10 +4298,13 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report_port.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rewrt_db.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_logs.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_4_bytes.test
@@ -4282,6 +4330,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_find_row.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_func001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_func002.test
@@ -4297,6 +4346,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
@@ -4374,6 +4424,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ssl.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ssl1.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_000001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
@@ -4396,6 +4447,8 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_no_op.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
@@ -4459,6 +4512,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/stress/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_memory.test
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_myisam.test
+-rw-r--r--	root/root	usr/mysql-test/suite/stress/t/wrapper.test
 drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/
 drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/inc/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/inc/autocommit_func2.inc
@@ -4610,6 +4664,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result
@@ -4624,8 +4679,10 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
@@ -4659,6 +4716,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_version_basic.result
@@ -4743,6 +4801,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/maximum_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/metadata_locks_cache_size_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
@@ -4908,6 +4967,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/ssl_key_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/stored_program_cache_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_frm_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
@@ -5076,6 +5136,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test
@@ -5085,13 +5146,16 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
@@ -5125,6 +5189,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_use_native_aio_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_version_basic.test
@@ -5212,6 +5277,8 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/maximum_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/maximum_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
@@ -5279,6 +5346,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pid_file_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/port_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
@@ -5407,6 +5475,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/ssl_key_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/storage_engine_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/stored_program_cache_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_binlog_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_frm_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_master_info_basic.test
@@ -5462,15 +5531,20 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/archive_gis.test
 -rw-r--r--	root/root	usr/mysql-test/t/archive_plugin-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/archive_plugin.test
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl-master.opt
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl.test
 -rw-r--r--	root/root	usr/mysql-test/t/auto_increment.test
 -rw-r--r--	root/root	usr/mysql-test/t/bench_count_distinct.test
 -rw-r--r--	root/root	usr/mysql-test/t/bigint.test
 -rw-r--r--	root/root	usr/mysql-test/t/binary.test
+-rw-r--r--	root/root	usr/mysql-test/t/blackhole.test
 -rw-r--r--	root/root	usr/mysql-test/t/blackhole_plugin-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/blackhole_plugin.test
 -rw-r--r--	root/root	usr/mysql-test/t/bool.test
 -rw-r--r--	root/root	usr/mysql-test/t/bootstrap-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bootstrap.test
+-rw-r--r--	root/root	usr/mysql-test/t/bug13633383.test
 -rw-r--r--	root/root	usr/mysql-test/t/bug39022.test
 -rw-r--r--	root/root	usr/mysql-test/t/bug46080-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bug46080.test
@@ -5483,7 +5557,6 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/bug58669-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bug58669.test
 -rw-r--r--	root/root	usr/mysql-test/t/bulk_replace.test
--rw-r--r--	root/root	usr/mysql-test/t/cache_innodb-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/cache_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/t/case.test
 -rw-r--r--	root/root	usr/mysql-test/t/cast.test
@@ -5898,6 +5971,7 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/partition_binlog_stmt.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_blackhole.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_bug18198.test
+-rw-r--r--	root/root	usr/mysql-test/t/partition_cache.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_charset.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_column.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_column_prune.test
diff --git a/mysql/.footprint.x86_64 b/mysql/.footprint.x86_64
index 53113841c..58022f369 100644
--- a/mysql/.footprint.x86_64
+++ b/mysql/.footprint.x86_64
@@ -17,7 +17,7 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34mysql -> ../init.d/mysql
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
 drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	srv/
 drwx------	root/root	srv/mysql/
@@ -136,7 +136,6 @@ drwxr-xr-x	root/root	usr/mysql-test/extra/rpl_tests/
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
--rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_id.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
 -rw-r--r--	root/root	usr/mysql-test/extra/rpl_tests/rpl_insert_ignore.test
@@ -345,6 +344,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/is_embedded.inc
 -rw-r--r--	root/root	usr/mysql-test/include/kill_query.inc
 -rw-r--r--	root/root	usr/mysql-test/include/kill_query_and_diff_master_slave.inc
+-rw-r--r--	root/root	usr/mysql-test/include/libdaemon_example.ini
 -rw-r--r--	root/root	usr/mysql-test/include/linux_sys_vars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/load_sysvars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/loaddata_autocom.inc
@@ -402,6 +402,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/query_cache.inc
 -rw-r--r--	root/root	usr/mysql-test/include/query_cache_sql_prepare.inc
 -rw-r--r--	root/root	usr/mysql-test/include/read_many_rows.inc
+-rw-r--r--	root/root	usr/mysql-test/include/relocate_binlogs.inc
 -rw-r--r--	root/root	usr/mysql-test/include/report-features.test
 -rw-r--r--	root/root	usr/mysql-test/include/restart_mysqld.inc
 -rw-r--r--	root/root	usr/mysql-test/include/restart_slave_sql.inc
@@ -454,6 +455,7 @@ drwxr-xr-x	root/root	usr/mysql-test/include/
 -rw-r--r--	root/root	usr/mysql-test/include/show_msg80.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_relaylog_events.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_rpl_debug_info.inc
+-rw-r--r--	root/root	usr/mysql-test/include/show_slave_hosts.inc
 -rw-r--r--	root/root	usr/mysql-test/include/show_slave_status.inc
 -rw-r--r--	root/root	usr/mysql-test/include/sp-vars.inc
 -rw-r--r--	root/root	usr/mysql-test/include/start_slave.inc
@@ -567,6 +569,7 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/archive_debug.result
 -rw-r--r--	root/root	usr/mysql-test/r/archive_gis.result
 -rw-r--r--	root/root	usr/mysql-test/r/archive_plugin.result
+-rw-r--r--	root/root	usr/mysql-test/r/auth_rpl.result
 -rw-r--r--	root/root	usr/mysql-test/r/auto_increment.result
 -rw-r--r--	root/root	usr/mysql-test/r/backup.result
 -rw-r--r--	root/root	usr/mysql-test/r/bench_count_distinct.result
@@ -574,9 +577,11 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/bigint.result
 -rw-r--r--	root/root	usr/mysql-test/r/binary.result
 -rw-r--r--	root/root	usr/mysql-test/r/binlog_tx_isolation.result
+-rw-r--r--	root/root	usr/mysql-test/r/blackhole.result
 -rw-r--r--	root/root	usr/mysql-test/r/blackhole_plugin.result
 -rw-r--r--	root/root	usr/mysql-test/r/bool.result
 -rw-r--r--	root/root	usr/mysql-test/r/bootstrap.result
+-rw-r--r--	root/root	usr/mysql-test/r/bug13633383.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug39022.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug46080.result
 -rw-r--r--	root/root	usr/mysql-test/r/bug46261.result
@@ -986,6 +991,7 @@ drwxr-xr-x	root/root	usr/mysql-test/r/
 -rw-r--r--	root/root	usr/mysql-test/r/partition_binlog_stmt.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_blackhole.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_bug18198.result
+-rw-r--r--	root/root	usr/mysql-test/r/partition_cache.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_charset.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_column.result
 -rw-r--r--	root/root	usr/mysql-test/r/partition_column_prune.result
@@ -1209,6 +1215,7 @@ drwxr-xr-x	root/root	usr/mysql-test/std_data/
 -rw-r--r--	root/root	usr/mysql-test/std_data/bad_gis_data.dat
 -rw-r--r--	root/root	usr/mysql-test/std_data/binlog_savepoint.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/binlog_transaction.000001
+-rw-r--r--	root/root	usr/mysql-test/std_data/bug11747416_32228_binlog.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug15328.cnf
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug16266.000001
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug19371.MYD
@@ -1237,7 +1244,6 @@ drwxr-xr-x	root/root	usr/mysql-test/std_data/
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.CSM
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.CSV
 -rw-r--r--	root/root	usr/mysql-test/std_data/bug49823.frm
--rw-r--r--	root/root	usr/mysql-test/std_data/bug57108.cnf
 -rw-r--r--	root/root	usr/mysql-test/std_data/cacert.pem
 -rw-r--r--	root/root	usr/mysql-test/std_data/charset_utf8.txt
 -rw-r--r--	root/root	usr/mysql-test/std_data/checkDBI_DBD-mysql.pl
@@ -2460,7 +2466,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/federated/
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin-master.opt
--rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.result (EMPTY)
+-rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_plugin.test
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_server.result
 -rw-r--r--	root/root	usr/mysql-test/suite/federated/federated_server.test
@@ -2826,8 +2832,6 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/funcs_2/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/funcs_2/t/myisam_charset.test
 -rw-r--r--	root/root	usr/mysql-test/suite/funcs_2/t/suite.opt
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/
-drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/include/
--rw-r--r--	root/root	usr/mysql-test/suite/innodb/include/innodb-index.inc
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-analyze.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-18274.result
@@ -2835,6 +2839,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-56228.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-autoinc.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-blob.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-consistent.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-create-options.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-index.result
@@ -2849,6 +2854,12 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb-zip.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug11754376.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug11766634.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug12400341.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug12661768.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug13510739.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug13635833.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug21704.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug30423.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -2899,19 +2910,25 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59307.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59410.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59641.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug59733.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60049.result
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60196.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_bug60229.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_file_format.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_gis.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_index_large_prefix.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_information_schema.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_misc1.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_multi_update.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_mysql.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_notembedded.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_replace.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/r/innodb_trx_weight.result
 drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
@@ -2925,6 +2942,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-autoinc.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-blob.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-consistent-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-consistent.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb-create-options.test
@@ -2944,6 +2962,14 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11754376.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11766634-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug11766634.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12400341.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug12661768.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug13510739.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug13635833.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug21704.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug30423.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@@ -2969,6 +2995,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug45357.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug46000.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug46676.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47167-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47167.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47621.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug47622.test
@@ -2999,16 +3026,25 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59307.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59410.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59641.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug59733.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60049-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60049.test
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
 -rwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60196.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_bug60229.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_file_format-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_file_format.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_gis.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_index_large_prefix.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_information_schema.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_misc1-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_misc1.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_multi_update.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_mysql-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_mysql.test
@@ -3017,6 +3053,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/innodb/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_notembedded.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
+-rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_replace.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
 -rw-r--r--	root/root	usr/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -3759,6 +3796,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_errors.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_grant.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_binlog_index.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bit.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bit_npk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_blackhole.result
@@ -3768,6 +3806,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug37426.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug38694.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_bug41902.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_change_master.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_charset.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_charset_sjis.result
@@ -3776,6 +3815,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_commit_after_flush.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_concurrency_error.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_conditional_comments.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_connection.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_database.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
@@ -3826,11 +3866,9 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert.result
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_duplicate.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_id.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_id_pk.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_ignore.result
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_insert_select.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_invoked_features.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ip_mix.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ip_mix2.result
@@ -3891,8 +3929,10 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_replicate_do.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_report.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_report_port.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rewrt_db.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rotate_logs.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_4_bytes.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_NOW.result
@@ -3914,6 +3954,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_find_row.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_func001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_func002.result
@@ -3927,6 +3968,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_log.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_merge_engine.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_multi_query.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
@@ -3986,6 +4028,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_sporadic_master.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ssl.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_ssl1.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_000001.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
@@ -4005,6 +4048,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_multi_query.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_no_op.result
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
@@ -4058,6 +4102,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_errors.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_grant.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_binlog_index.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bit.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bit_npk.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -4070,6 +4115,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug38694.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_bug41902.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_change_master.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_charset.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_charset_sjis.test
@@ -4080,6 +4126,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_concurrency_error.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_conditional_comments.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_connection.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_create_database.test
@@ -4156,11 +4203,9 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert.test
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_duplicate.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_id.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_ignore.test
--rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_insert_select.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_invoked_features.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt
@@ -4253,10 +4298,13 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_report_port.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rewrt_db.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_logs.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_4_bytes.test
@@ -4282,6 +4330,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_find_row.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_func001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_func002.test
@@ -4297,6 +4346,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
@@ -4374,6 +4424,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ssl.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_ssl1.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_000001.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
@@ -4396,6 +4447,8 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/rpl/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_no_op.test
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
 -rw-r--r--	root/root	usr/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
@@ -4459,6 +4512,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/stress/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_memory.test
 -rw-r--r--	root/root	usr/mysql-test/suite/stress/t/ddl_myisam.test
+-rw-r--r--	root/root	usr/mysql-test/suite/stress/t/wrapper.test
 drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/
 drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/inc/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/inc/autocommit_func2.inc
@@ -4610,6 +4664,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result
@@ -4624,8 +4679,10 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
@@ -4659,6 +4716,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/innodb_version_basic.result
@@ -4743,6 +4801,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/maximum_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/metadata_locks_cache_size_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
@@ -4908,6 +4967,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/r/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/ssl_key_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/stored_program_cache_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_frm_basic.result
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
@@ -5076,6 +5136,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test
@@ -5085,13 +5146,16 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
@@ -5125,6 +5189,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_use_native_aio_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/innodb_version_basic.test
@@ -5212,6 +5277,8 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/maximum_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/maximum_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
@@ -5279,6 +5346,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/pid_file_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/port_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
@@ -5407,6 +5475,7 @@ drwxr-xr-x	root/root	usr/mysql-test/suite/sys_vars/t/
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/ssl_key_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/storage_engine_basic.test
+-rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/stored_program_cache_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_binlog_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_frm_basic.test
 -rw-r--r--	root/root	usr/mysql-test/suite/sys_vars/t/sync_master_info_basic.test
@@ -5462,15 +5531,20 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/archive_gis.test
 -rw-r--r--	root/root	usr/mysql-test/t/archive_plugin-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/archive_plugin.test
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl-master.opt
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl-slave.opt
+-rw-r--r--	root/root	usr/mysql-test/t/auth_rpl.test
 -rw-r--r--	root/root	usr/mysql-test/t/auto_increment.test
 -rw-r--r--	root/root	usr/mysql-test/t/bench_count_distinct.test
 -rw-r--r--	root/root	usr/mysql-test/t/bigint.test
 -rw-r--r--	root/root	usr/mysql-test/t/binary.test
+-rw-r--r--	root/root	usr/mysql-test/t/blackhole.test
 -rw-r--r--	root/root	usr/mysql-test/t/blackhole_plugin-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/blackhole_plugin.test
 -rw-r--r--	root/root	usr/mysql-test/t/bool.test
 -rw-r--r--	root/root	usr/mysql-test/t/bootstrap-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bootstrap.test
+-rw-r--r--	root/root	usr/mysql-test/t/bug13633383.test
 -rw-r--r--	root/root	usr/mysql-test/t/bug39022.test
 -rw-r--r--	root/root	usr/mysql-test/t/bug46080-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bug46080.test
@@ -5483,7 +5557,6 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/bug58669-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/bug58669.test
 -rw-r--r--	root/root	usr/mysql-test/t/bulk_replace.test
--rw-r--r--	root/root	usr/mysql-test/t/cache_innodb-master.opt
 -rw-r--r--	root/root	usr/mysql-test/t/cache_innodb.test
 -rw-r--r--	root/root	usr/mysql-test/t/case.test
 -rw-r--r--	root/root	usr/mysql-test/t/cast.test
@@ -5898,6 +5971,7 @@ drwxr-xr-x	root/root	usr/mysql-test/t/
 -rw-r--r--	root/root	usr/mysql-test/t/partition_binlog_stmt.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_blackhole.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_bug18198.test
+-rw-r--r--	root/root	usr/mysql-test/t/partition_cache.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_charset.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_column.test
 -rw-r--r--	root/root	usr/mysql-test/t/partition_column_prune.test
diff --git a/mysql/.md5sum.i686 b/mysql/.md5sum.i686
index e09f67608..dd423c407 100644
--- a/mysql/.md5sum.i686
+++ b/mysql/.md5sum.i686
@@ -1,2 +1 @@
-deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
-462ab3752dd666ec06ca32f92673b59e  mysql-5.5.16.tar.gz
+dc84f8a0305e054c859533944e79f803  mysql-5.5.24.tar.gz
diff --git a/mysql/.md5sum.x86_64 b/mysql/.md5sum.x86_64
index e09f67608..dd423c407 100644
--- a/mysql/.md5sum.x86_64
+++ b/mysql/.md5sum.x86_64
@@ -1,2 +1 @@
-deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
-462ab3752dd666ec06ca32f92673b59e  mysql-5.5.16.tar.gz
+dc84f8a0305e054c859533944e79f803  mysql-5.5.24.tar.gz
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index e717a2a15..cf5c924df 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -4,15 +4,19 @@
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: cmake, mysqlclient
 # Run on: mysqlclient
-source /etc/blfs-bootscripts
 
 name=mysql
-version=5.5.16
+version=5.5.24
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz
-	http://nutyx.meticul.eu/files/patchs/aaabasicfs/$scripts-$scriptsversion.tar.bz2)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz)
 
 build () {
+        source /etc/blfs-bootscripts
+        wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+        tar xf $scripts-$scriptsversion.tar.bz2
+        cd $scripts-$scriptsversion
+        make DESTDIR=$PKG install-mysql
+
 	cd $SRC
 	mkdir build
 	cd build
@@ -77,7 +81,4 @@ build () {
 	mkdir -p $PKG/etc
 	install -v -m644 $PKG/usr/share/mysql/my-medium.cnf $PKG/etc/my.cnf
 	sed -i -e s/^skip-federated/#skip-federated/ $PKG/etc/my.cnf
-	cd ../$scripts-$scriptsversion
-	make DESTDIR=$PKG install-mysql
 }
-