Update to latest version, tested @i386, comments ? ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.168
diff -u -p -r1.168 Makefile
--- Makefile 18 Jun 2010 11:31:11 -0000 1.168
+++ Makefile 16 Sep 2010 16:46:41 -0000
@@ -6,7 +6,7 @@ COMMENT-main= multithreaded SQL database
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
-VERSION= 5.1.48
+VERSION= 5.1.50
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}
@@ -76,10 +76,10 @@ MULTI_PACKAGES= -main -server -tests
RUN_DEPENDS-server= :mysql-client->=5.1,<5.2:${BASE_PKGPATH} \
:p5-DBD-mysql-*:databases/p5-DBD-mysql
-LIB_DEPENDS-server= mysqlclient:mysql-client->=5.1,<5.2:${BASE_PKGPATH}
+LIB_DEPENDS-server= :mysql-client->=5.1,<5.2:${BASE_PKGPATH}
-WANTLIB-server= ${WANTLIB} crypto ssl stdc++ wrap z
-WANTLIB-main= ${WANTLIB} crypto ncurses readline ssl z
+WANTLIB-server= ${WANTLIB} crypto mysqlclient ssl stdc++ wrap z
+WANTLIB-main= ${WANTLIB} crypto ncursesw readline ssl z
WANTLIB-tests= ${WANTLIB}
post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo 18 Jun 2010 11:31:11 -0000 1.50
+++ distinfo 16 Sep 2010 16:46:41 -0000
@@ -1,5 +1,5 @@
-MD5 (mysql-5.1.48.tar.gz) = 0ExU0c+9jGyGUMjQePiFsg==
-RMD160 (mysql-5.1.48.tar.gz) = eDV19dxO8ATIJWh45mGdI8wzquQ=
-SHA1 (mysql-5.1.48.tar.gz) = YTJ9hYinPrHKYake762c5XG6xYg=
-SHA256 (mysql-5.1.48.tar.gz) = hDxwlCbYAoGADdXN8IU3Pzz3Q5G1Mdm8B++l+C3hBL0=
-SIZE (mysql-5.1.48.tar.gz) = 23362742
+MD5 (mysql-5.1.50.tar.gz) = I7rEoKr9aDsHfawUbOJwHw==
+RMD160 (mysql-5.1.50.tar.gz) = X0tqxEXuOGuzAE8MJ2Byg9AR2jw=
+SHA1 (mysql-5.1.50.tar.gz) = +1mC+3O7LrBJRhU1KnUQ91EUxtk=
+SHA256 (mysql-5.1.50.tar.gz) = 5xN+ZRc/jyoIvj9S3vSUuy0mgpHpyb2Y6zY3cuWKbeg=
+SIZE (mysql-5.1.50.tar.gz) = 23750564
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST-tests
--- pkg/PLIST-tests 18 Jun 2010 11:31:11 -0000 1.42
+++ pkg/PLIST-tests 16 Sep 2010 16:46:48 -0000
@@ -314,6 +314,7 @@ share/mysql-test/include/mtr_check.sql
share/mysql-test/include/mtr_warnings.sql
share/mysql-test/include/mysqlbinlog_row_engine.inc
share/mysql-test/include/mysqldump.inc
+share/mysql-test/include/mysqlhotcopy.inc
share/mysql-test/include/mysqltest-x.inc
share/mysql-test/include/ndb_backup.inc
share/mysql-test/include/ndb_backup_print.inc
@@ -354,6 +355,7 @@ share/mysql-test/include/report-features
share/mysql-test/include/reset_master_and_slave.inc
share/mysql-test/include/restart_mysqld.inc
share/mysql-test/include/rowid_order.inc
+share/mysql-test/include/rpl_diff_tables.inc
share/mysql-test/include/rpl_events.inc
share/mysql-test/include/rpl_loaddata_charset.inc
share/mysql-test/include/rpl_multi_engine.inc
@@ -709,19 +711,8 @@ share/mysql-test/r/information_schema_in
share/mysql-test/r/information_schema_part.result
share/mysql-test/r/init_connect.result
share/mysql-test/r/init_file.result
-share/mysql-test/r/innodb-autoinc-optimize.result
-share/mysql-test/r/innodb-ucs2.result
-share/mysql-test/r/innodb_autoinc_lock_mode_zero.result
-share/mysql-test/r/innodb_bug30919.result
-share/mysql-test/r/innodb_bug42419.result
-share/mysql-test/r/innodb_gis.result
share/mysql-test/r/innodb_ignore_builtin.result
-share/mysql-test/r/innodb_lock_wait_timeout_1.result
-share/mysql-test/r/innodb_mysql.result
share/mysql-test/r/innodb_mysql_lock2.result
-share/mysql-test/r/innodb_mysql_rbk.result
-share/mysql-test/r/innodb_notembedded.result
-share/mysql-test/r/innodb_timeout_rollback.result
share/mysql-test/r/insert.result
share/mysql-test/r/insert_notembedded.result
share/mysql-test/r/insert_select.result
@@ -809,6 +800,8 @@ share/mysql-test/r/mysqldump-max.result
share/mysql-test/r/mysqldump-no-binlog.result
share/mysql-test/r/mysqldump.result
share/mysql-test/r/mysqldump_restore.result
+share/mysql-test/r/mysqlhotcopy_archive.result
+share/mysql-test/r/mysqlhotcopy_myisam.result
share/mysql-test/r/mysqlshow.result
share/mysql-test/r/mysqlslap.result
share/mysql-test/r/mysqltest.result
@@ -1100,6 +1093,7 @@ share/mysql-test/std_data/funcs_1/t4.txt
share/mysql-test/std_data/funcs_1/t7.txt
share/mysql-test/std_data/funcs_1/t9.txt
share/mysql-test/std_data/init_file.dat
+share/mysql-test/std_data/intersect-bug50389.tsv
share/mysql-test/std_data/latin1.xml
share/mysql-test/std_data/loaddata1.dat
share/mysql-test/std_data/loaddata2.dat
@@ -2675,12 +2669,16 @@ share/mysql-test/suite/innodb/
share/mysql-test/suite/innodb/include/
share/mysql-test/suite/innodb/r/
share/mysql-test/suite/innodb/r/innodb-autoinc-44030.result
+share/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
share/mysql-test/suite/innodb/r/innodb-autoinc.result
share/mysql-test/suite/innodb/r/innodb-lock.result
share/mysql-test/suite/innodb/r/innodb-replace.result
share/mysql-test/suite/innodb/r/innodb-semi-consistent.result
+share/mysql-test/suite/innodb/r/innodb-ucs2.result
share/mysql-test/suite/innodb/r/innodb.result
+share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb/r/innodb_bug21704.result
+share/mysql-test/suite/innodb/r/innodb_bug30919.result
share/mysql-test/suite/innodb/r/innodb_bug34053.result
share/mysql-test/suite/innodb/r/innodb_bug34300.result
share/mysql-test/suite/innodb/r/innodb_bug35220.result
@@ -2689,6 +2687,7 @@ share/mysql-test/suite/innodb/r/innodb_b
share/mysql-test/suite/innodb/r/innodb_bug40565.result
share/mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result
share/mysql-test/suite/innodb/r/innodb_bug42101.result
+share/mysql-test/suite/innodb/r/innodb_bug42419.result
share/mysql-test/suite/innodb/r/innodb_bug44369.result
share/mysql-test/suite/innodb/r/innodb_bug45357.result
share/mysql-test/suite/innodb/r/innodb_bug46000.result
@@ -2698,20 +2697,35 @@ share/mysql-test/suite/innodb/r/innodb_b
share/mysql-test/suite/innodb/r/innodb_bug49164.result
share/mysql-test/suite/innodb/r/innodb_bug51920.result
share/mysql-test/suite/innodb/r/innodb_bug52663.result
+share/mysql-test/suite/innodb/r/innodb_bug53674.result
+share/mysql-test/suite/innodb/r/innodb_bug53756.result
+share/mysql-test/suite/innodb/r/innodb_bug54044.result
+share/mysql-test/suite/innodb/r/innodb_gis.result
+share/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
share/mysql-test/suite/innodb/r/innodb_misc1.result
share/mysql-test/suite/innodb/r/innodb_multi_update.result
+share/mysql-test/suite/innodb/r/innodb_mysql.result
+share/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
+share/mysql-test/suite/innodb/r/innodb_notembedded.result
+share/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
share/mysql-test/suite/innodb/r/innodb_trx_weight.result
share/mysql-test/suite/innodb/t/
share/mysql-test/suite/innodb/t/disabled.def
share/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
+share/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
share/mysql-test/suite/innodb/t/innodb-autoinc.test
share/mysql-test/suite/innodb/t/innodb-lock.test
share/mysql-test/suite/innodb/t/innodb-master.opt
share/mysql-test/suite/innodb/t/innodb-replace.test
share/mysql-test/suite/innodb/t/innodb-semi-consistent-master.opt
share/mysql-test/suite/innodb/t/innodb-semi-consistent.test
+share/mysql-test/suite/innodb/t/innodb-ucs2.test
share/mysql-test/suite/innodb/t/innodb.test
+share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
+share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb/t/innodb_bug21704.test
+share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug30919.test
share/mysql-test/suite/innodb/t/innodb_bug34053.test
share/mysql-test/suite/innodb/t/innodb_bug34300.test
share/mysql-test/suite/innodb/t/innodb_bug35220.test
@@ -2722,6 +2736,7 @@ share/mysql-test/suite/innodb/t/innodb_b
share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt
share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test
share/mysql-test/suite/innodb/t/innodb_bug42101.test
+share/mysql-test/suite/innodb/t/innodb_bug42419.test
share/mysql-test/suite/innodb/t/innodb_bug44369.test
share/mysql-test/suite/innodb/t/innodb_bug45357.test
share/mysql-test/suite/innodb/t/innodb_bug46000.test
@@ -2732,10 +2747,174 @@ share/mysql-test/suite/innodb/t/innodb_b
share/mysql-test/suite/innodb/t/innodb_bug51920.test
share/mysql-test/suite/innodb/t/innodb_bug52663-master.opt
share/mysql-test/suite/innodb/t/innodb_bug52663.test
+share/mysql-test/suite/innodb/t/innodb_bug53674-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug53674.test
+share/mysql-test/suite/innodb/t/innodb_bug53756-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug53756.test
+share/mysql-test/suite/innodb/t/innodb_bug54044.test
+share/mysql-test/suite/innodb/t/innodb_gis.test
+share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
+share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
share/mysql-test/suite/innodb/t/innodb_misc1-master.opt
share/mysql-test/suite/innodb/t/innodb_misc1.test
share/mysql-test/suite/innodb/t/innodb_multi_update.test
+share/mysql-test/suite/innodb/t/innodb_mysql-master.opt
+share/mysql-test/suite/innodb/t/innodb_mysql.test
+share/mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
+share/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
+share/mysql-test/suite/innodb/t/innodb_notembedded.test
+share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
+share/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
share/mysql-test/suite/innodb/t/innodb_trx_weight.test
+share/mysql-test/suite/innodb_plugin/
+share/mysql-test/suite/innodb_plugin/include/
+share/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc
+share/mysql-test/suite/innodb_plugin/include/innodb-index.inc
+share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
+share/mysql-test/suite/innodb_plugin/r/
+share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result
+share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
+share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
+share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
+share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
+share/mysql-test/suite/innodb_plugin/r/innodb-index.result
+share/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result
+share/mysql-test/suite/innodb_plugin/r/innodb-lock.result
+share/mysql-test/suite/innodb_plugin/r/innodb-replace.result
+share/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result
+share/mysql-test/suite/innodb_plugin/r/innodb-timeout.result
+share/mysql-test/suite/innodb_plugin/r/innodb-ucs2.result
+share/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result
+share/mysql-test/suite/innodb_plugin/r/innodb-zip.result
+share/mysql-test/suite/innodb_plugin/r/innodb.result
+share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug34053.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug34300.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug35220.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug36169.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug36172.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug38231.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug39438.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug40360.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug40565.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug41904.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug42101-nonzero.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug42101.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug42419.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug44032.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug44369.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug44571.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug45357.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug46000.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug46676.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug47621.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug47622.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug47777.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug48024.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug49164.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug52663.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug53592.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug54044.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug54679.result
+share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
+share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
+share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
+share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
+share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
+share/mysql-test/suite/innodb_plugin/r/innodb_mysql.result
+share/mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result
+share/mysql-test/suite/innodb_plugin/r/innodb_notembedded.result
+share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
+share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
+share/mysql-test/suite/innodb_plugin/t/
+share/mysql-test/suite/innodb_plugin/t/disabled.def
+share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
+share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
+share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
+share/mysql-test/suite/innodb_plugin/t/innodb-index.test
+share/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
+share/mysql-test/suite/innodb_plugin/t/innodb-lock.test
+share/mysql-test/suite/innodb_plugin/t/innodb-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb-replace.test
+share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test
+share/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
+share/mysql-test/suite/innodb_plugin/t/innodb-ucs2.test
+share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test
+share/mysql-test/suite/innodb_plugin/t/innodb-zip.test
+share/mysql-test/suite/innodb_plugin/t/innodb.test
+share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug30919.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug35220.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug36169.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug39438-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug39438.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug40360.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug40565.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug41904.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug42101.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug42419.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug44032.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug44571.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug49164.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug52663.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53592.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug54044.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
+share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
+share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
+share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
+share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
+share/mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
+share/mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test
+share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk.test
+share/mysql-test/suite/innodb_plugin/t/innodb_notembedded.test
+share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback.test
+share/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test
share/mysql-test/suite/jp/
share/mysql-test/suite/jp/include/
share/mysql-test/suite/jp/include/trim_sjis.inc
@@ -3466,12 +3645,14 @@ share/mysql-test/suite/rpl/r/rpl_circula
share/mysql-test/suite/rpl/r/rpl_colSize.result
share/mysql-test/suite/rpl/r/rpl_commit_after_flush.result
share/mysql-test/suite/rpl/r/rpl_concurrency_error.result
+share/mysql-test/suite/rpl/r/rpl_conditional_comments.result
share/mysql-test/suite/rpl/r/rpl_create_database.result
share/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
share/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
share/mysql-test/suite/rpl/r/rpl_critical_errors.result
share/mysql-test/suite/rpl/r/rpl_critical_errors.result.txt
share/mysql-test/suite/rpl/r/rpl_cross_version.result
+share/mysql-test/suite/rpl/r/rpl_current_user.result
share/mysql-test/suite/rpl/r/rpl_ddl.result
share/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
share/mysql-test/suite/rpl/r/rpl_delete_no_where.result
@@ -3585,9 +3766,9 @@ share/mysql-test/suite/rpl/r/rpl_row_col
share/mysql-test/suite/rpl/r/rpl_row_conflicts.result
share/mysql-test/suite/rpl/r/rpl_row_create_table.result
share/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
-share/mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result
share/mysql-test/suite/rpl/r/rpl_row_drop.result
share/mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result
+share/mysql-test/suite/rpl/r/rpl_row_find_row.result
share/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
share/mysql-test/suite/rpl/r/rpl_row_func001.result
share/mysql-test/suite/rpl/r/rpl_row_func002.result
@@ -3731,6 +3912,7 @@ share/mysql-test/suite/rpl/t/rpl_colSize
share/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
share/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt
share/mysql-test/suite/rpl/t/rpl_concurrency_error.test
+share/mysql-test/suite/rpl/t/rpl_conditional_comments.test
share/mysql-test/suite/rpl/t/rpl_create_database-master.opt
share/mysql-test/suite/rpl/t/rpl_create_database-slave.opt
share/mysql-test/suite/rpl/t/rpl_create_database.test
@@ -3739,6 +3921,8 @@ share/mysql-test/suite/rpl/t/rpl_create_
share/mysql-test/suite/rpl/t/rpl_critical_errors.test
share/mysql-test/suite/rpl/t/rpl_cross_version-master.opt
share/mysql-test/suite/rpl/t/rpl_cross_version.test
+share/mysql-test/suite/rpl/t/rpl_current_user.cnf
+share/mysql-test/suite/rpl/t/rpl_current_user.test
share/mysql-test/suite/rpl/t/rpl_ddl.test
share/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
share/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
@@ -3905,10 +4089,10 @@ share/mysql-test/suite/rpl/t/rpl_row_col
share/mysql-test/suite/rpl/t/rpl_row_conflicts.test
share/mysql-test/suite/rpl/t/rpl_row_create_table.test
share/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
-share/mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test
share/mysql-test/suite/rpl/t/rpl_row_drop.test
share/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
share/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
+share/mysql-test/suite/rpl/t/rpl_row_find_row.test
share/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
share/mysql-test/suite/rpl/t/rpl_row_func001.test
share/mysql-test/suite/rpl/t/rpl_row_func002.test
@@ -4407,26 +4591,9 @@ share/mysql-test/t/init_connect-master.o
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-autoinc-optimize.test
-share/mysql-test/t/innodb-ucs2.test
-share/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt
-share/mysql-test/t/innodb_autoinc_lock_mode_zero.test
-share/mysql-test/t/innodb_bug30919-master.opt
-share/mysql-test/t/innodb_bug30919.test
-share/mysql-test/t/innodb_bug42419.test
-share/mysql-test/t/innodb_gis.test
share/mysql-test/t/innodb_ignore_builtin-master.opt
share/mysql-test/t/innodb_ignore_builtin.test
-share/mysql-test/t/innodb_lock_wait_timeout_1-master.opt
-share/mysql-test/t/innodb_lock_wait_timeout_1.test
-share/mysql-test/t/innodb_mysql-master.opt
-share/mysql-test/t/innodb_mysql.test
share/mysql-test/t/innodb_mysql_lock2.test
-share/mysql-test/t/innodb_mysql_rbk-master.opt
-share/mysql-test/t/innodb_mysql_rbk.test
-share/mysql-test/t/innodb_notembedded.test
-share/mysql-test/t/innodb_timeout_rollback-master.opt
-share/mysql-test/t/innodb_timeout_rollback.test
share/mysql-test/t/insert.test
share/mysql-test/t/insert_notembedded.test
share/mysql-test/t/insert_select.test
@@ -4540,6 +4707,8 @@ share/mysql-test/t/mysqldump-no-binlog-m
share/mysql-test/t/mysqldump-no-binlog.test
share/mysql-test/t/mysqldump.test
share/mysql-test/t/mysqldump_restore.test
+share/mysql-test/t/mysqlhotcopy_archive.test
+share/mysql-test/t/mysqlhotcopy_myisam.test
share/mysql-test/t/mysqlshow.test
share/mysql-test/t/mysqlslap.test
share/mysql-test/t/mysqltest.test
@@ -4685,6 +4854,7 @@ share/mysql-test/t/sp_trans_log.test
share/mysql-test/t/sql_mode.test
share/mysql-test/t/ssl-big.test
share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_8k_key-master.opt
share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_compress.test
share/mysql-test/t/ssl_connect.test
