Thu Dec 16 03:42:50 2010 UTC ()
Update mysql51-{client,server} package to 5.1.54.

Functionality added or changed:

* Support for the IBMDB2I storage engine has been removed. (Bug#58079)

* The pstack library was nonfunctional and has been removed, along with the
  --with-pstack option for configure. The --enable-pstack option for mysqld is
  deprecated and will be removed in MySQL 5.5. (Bug#57210)

Bugs fixed:

* Performance: InnoDB Storage Engine: Improved concurrency when several
  ANALYZE TABLE or SHOW TABLE STATUS statements are run simultaneously for
  InnoDB tables. (Bug#53046)

* InnoDB Storage Engine: For an InnoDB table created with
  ROW_FORMAT=COMPRESSED or ROW_FORMAT=DYNAMIC, a query using the READ
  UNCOMMITTED isolation level could cause the server to stop with an assertion
  error, if BLOB or other large columns that use off-page storage were being
  inserted at the same time. (Bug#57799)

* Partitioning: An INSERT ... ON DUPLICATE KEY UPDATE column = 0 statement on
  an AUTO_INCREMENT column caused the debug server to crash. (Bug#57890)

* Several compilation problems were fixed. (Bug#57992, Bug#57993, Bug#57994,
  Bug#57995, Bug#57996, Bug#57997, Bug#58057)

* Passing a string that was not null-terminated to UpdateXML() or
  ExtractValue() caused the server to fail with an assertion. (Bug#57279)

* Queries executed using the Index Merge access method and a temporary file
  could return incorrect results. (Bug#56862)

* The find_files() function used by SHOW statements performed redundant and
  unnecessary memory allocation. (Bug#51208)


(taca)
diff -r1.15 -r1.16 pkgsrc/databases/mysql51-client/Makefile.common
diff -r1.11 -r1.12 pkgsrc/databases/mysql51-client/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/patches/patch-ab
diff -r1.11 -r1.12 pkgsrc/databases/mysql51-server/PLIST
diff -r1.13 -r1.14 pkgsrc/databases/mysql51-server/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/patches/patch-ab
cvs diff -r1.15 -r1.16 pkgsrc/databases/mysql51-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/11/26 13:52:58 1.15
+++ pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/12/16 03:42:49 1.16
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.15 2010/11/26 13:52:58 taca Exp $ 1# $NetBSD: Makefile.common,v 1.16 2010/12/16 03:42:49 taca Exp $
2# 2#
3# used by databases/mysql51-client/Makefile 3# used by databases/mysql51-client/Makefile
4# used by databases/mysql51-server/Makefile 4# used by databases/mysql51-server/Makefile
5# 5#
6 6
7DISTNAME= mysql-5.1.53 7DISTNAME= mysql-5.1.54
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} 9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.mysql.com/ 12HOMEPAGE= http://www.mysql.com/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19.include "options.mk" 19.include "options.mk"
20 20
cvs diff -r1.11 -r1.12 pkgsrc/databases/mysql51-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/distinfo 2010/11/26 13:52:58 1.11
+++ pkgsrc/databases/mysql51-client/Attic/distinfo 2010/12/16 03:42:49 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.11 2010/11/26 13:52:58 taca Exp $ 1$NetBSD: distinfo,v 1.12 2010/12/16 03:42:49 taca Exp $
2 2
3SHA1 (mysql-5.1.53.tar.gz) = 24064a4c0f8b88b30acb6ddb03f32e897ef061f3 3SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
4RMD160 (mysql-5.1.53.tar.gz) = e8fd69450dda85cf3f41269e6e3fca05caccc76d 4RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
5Size (mysql-5.1.53.tar.gz) = 23871815 bytes 5Size (mysql-5.1.54.tar.gz) = 23672236 bytes
6SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1 6SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
7SHA1 (patch-ab) = 7258ade5c4d9aa26cb1b1a93aac9da2f7ed92c2c 7SHA1 (patch-ab) = 66ea5217d98d33e1be44e4dda754a94496f1ea44
8SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4 8SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c 9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
10SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d 10SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d
11SHA1 (patch-af) = cc6cd10021b63564b893b02e1967d3c470f0e0b2 11SHA1 (patch-af) = cc6cd10021b63564b893b02e1967d3c470f0e0b2
12SHA1 (patch-ag) = 20e4f5ac5e7b7927339b8c46329533f29a3df56f 12SHA1 (patch-ag) = 20e4f5ac5e7b7927339b8c46329533f29a3df56f
13SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b 13SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b
14SHA1 (patch-ai) = 625474e24c6f6c7b921ffd1534fd2ff93fdf02c8 14SHA1 (patch-ai) = 625474e24c6f6c7b921ffd1534fd2ff93fdf02c8
15SHA1 (patch-aj) = 5b67806269894c6f1725716f96433643260184db 15SHA1 (patch-aj) = 5b67806269894c6f1725716f96433643260184db
16SHA1 (patch-ak) = af5309d7a5b48042368936c7540f90df3dc4aafe 16SHA1 (patch-ak) = af5309d7a5b48042368936c7540f90df3dc4aafe
17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec 17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
18SHA1 (patch-am) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 18SHA1 (patch-am) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
19SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32 19SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32
20SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a 20SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ab 2010/09/21 15:57:30 1.2
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ab 2010/12/16 03:42:49 1.3
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: patch-ab,v 1.2 2010/09/21 15:57:30 taca Exp $ 1$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:49 taca Exp $
2 2
3* process directories in client package. 3* process directories in client package.
4 4
5--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000 5--- Makefile.in.orig 2010-11-29 10:42:58.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -407,14 +407,8 @@ AUTOMAKE_OPTIONS = foreign 7@@ -407,13 +407,8 @@ AUTOMAKE_OPTIONS = foreign
8 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 8 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
9 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt 9 README COPYING CMakeLists.txt
10  10
11-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 11-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
12- @readline_topdir@ sql-common scripts \ 12- @readline_topdir@ sql-common scripts \
13- @pstack_dir@ \ 
14- @sql_union_dirs@ unittest \ 13- @sql_union_dirs@ unittest \
15- @sql_server@ @man_dirs@ tests \ 14- @sql_server@ @man_dirs@ tests \
16- netware @libmysqld_dirs@ \ 15- netware @libmysqld_dirs@ \
17- mysql-test support-files sql-bench @tools_dirs@ \ 16- mysql-test support-files sql-bench @tools_dirs@ \
18- win 17- win
19+SUBDIRS = . include @docs_dirs@ strings extra @sql_client_dirs@ \ 18+SUBDIRS = . include @docs_dirs@ strings extra @sql_client_dirs@ \
20+ scripts man 19+ scripts man
21  20
22 DIST_SUBDIRS = . include Docs zlib \ 21 DIST_SUBDIRS = . include Docs zlib \
23 cmd-line-utils sql-common scripts \ 22 cmd-line-utils sql-common scripts \
cvs diff -r1.11 -r1.12 pkgsrc/databases/mysql51-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/PLIST 2010/11/26 13:52:58 1.11
+++ pkgsrc/databases/mysql51-server/Attic/PLIST 2010/12/16 03:42:50 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2010/11/26 13:52:58 taca Exp $ 1@comment $NetBSD: PLIST,v 1.12 2010/12/16 03:42:50 taca Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8bin/mysql.server 8bin/mysql.server
9bin/mysql_client_test 9bin/mysql_client_test
10${PLIST.embedded}bin/mysql_client_test_embedded 10${PLIST.embedded}bin/mysql_client_test_embedded
11bin/mysql_install_db 11bin/mysql_install_db
12bin/mysql_secure_installation 12bin/mysql_secure_installation
13bin/mysql_tzinfo_to_sql 13bin/mysql_tzinfo_to_sql
14bin/mysql_waitpid 14bin/mysql_waitpid
@@ -91,26 +91,28 @@ man/man8/mysqld.8 @@ -91,26 +91,28 @@ man/man8/mysqld.8
91man/man8/mysqlmanager.8 91man/man8/mysqlmanager.8
92${PLIST.ndb}man/man8/ndb_mgmd.8 92${PLIST.ndb}man/man8/ndb_mgmd.8
93${PLIST.ndb}man/man8/ndbd.8 93${PLIST.ndb}man/man8/ndbd.8
94${PLIST.ndb}man/man8/ndbmtd.8 94${PLIST.ndb}man/man8/ndbmtd.8
95mysql-test/lib/My/SafeProcess/my_safe_process 95mysql-test/lib/My/SafeProcess/my_safe_process
96share/aclocal/mysql.m4 96share/aclocal/mysql.m4
97share/examples/rc.d/mysqld 97share/examples/rc.d/mysqld
98share/mysql-test/collections/README 98share/mysql-test/collections/README
99share/mysql-test/collections/README.experimental 99share/mysql-test/collections/README.experimental
100share/mysql-test/collections/default.daily 100share/mysql-test/collections/default.daily
101share/mysql-test/collections/default.experimental 101share/mysql-test/collections/default.experimental
102share/mysql-test/collections/default.push 102share/mysql-test/collections/default.push
103share/mysql-test/collections/default.weekly 103share/mysql-test/collections/default.weekly
 104share/mysql-test/collections/mysql-5.1-bugteam.daily
 105share/mysql-test/collections/mysql-5.1-bugteam.push
104share/mysql-test/extra/binlog_tests/binlog.test 106share/mysql-test/extra/binlog_tests/binlog.test
105share/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test 107share/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
106share/mysql-test/extra/binlog_tests/binlog_insert_delayed.test 108share/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
107share/mysql-test/extra/binlog_tests/binlog_truncate.test 109share/mysql-test/extra/binlog_tests/binlog_truncate.test
108share/mysql-test/extra/binlog_tests/blackhole.test 110share/mysql-test/extra/binlog_tests/blackhole.test
109share/mysql-test/extra/binlog_tests/ctype_cp932.test 111share/mysql-test/extra/binlog_tests/ctype_cp932.test
110share/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test 112share/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
111share/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test 113share/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
112share/mysql-test/extra/binlog_tests/database.test 114share/mysql-test/extra/binlog_tests/database.test
113share/mysql-test/extra/binlog_tests/drop_temp_table.test 115share/mysql-test/extra/binlog_tests/drop_temp_table.test
114share/mysql-test/extra/binlog_tests/innodb_stat.test 116share/mysql-test/extra/binlog_tests/innodb_stat.test
115share/mysql-test/extra/binlog_tests/insert_select-binlog.test 117share/mysql-test/extra/binlog_tests/insert_select-binlog.test
116share/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 118share/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -1216,26 +1218,27 @@ share/mysql-test/suite/binlog/std_data/v @@ -1216,26 +1218,27 @@ share/mysql-test/suite/binlog/std_data/v
1216share/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 1218share/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001
1217share/mysql-test/suite/binlog/std_data/ver_5_1_17.001 1219share/mysql-test/suite/binlog/std_data/ver_5_1_17.001
1218share/mysql-test/suite/binlog/std_data/ver_5_1_23.001 1220share/mysql-test/suite/binlog/std_data/ver_5_1_23.001
1219share/mysql-test/suite/binlog/std_data/write-full-row.binlog 1221share/mysql-test/suite/binlog/std_data/write-full-row.binlog
1220share/mysql-test/suite/binlog/std_data/write-partial-row.binlog 1222share/mysql-test/suite/binlog/std_data/write-partial-row.binlog
1221share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt 1223share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt
1222share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test 1224share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
1223share/mysql-test/suite/binlog/t/binlog_base64_flag.test 1225share/mysql-test/suite/binlog/t/binlog_base64_flag.test
1224share/mysql-test/suite/binlog/t/binlog_database.test 1226share/mysql-test/suite/binlog/t/binlog_database.test
1225share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test 1227share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
1226share/mysql-test/suite/binlog/t/binlog_grant.test 1228share/mysql-test/suite/binlog/t/binlog_grant.test
1227share/mysql-test/suite/binlog/t/binlog_incident-master.opt 1229share/mysql-test/suite/binlog/t/binlog_incident-master.opt
1228share/mysql-test/suite/binlog/t/binlog_incident.test 1230share/mysql-test/suite/binlog/t/binlog_incident.test
 1231share/mysql-test/suite/binlog/t/binlog_index-master.opt
1229share/mysql-test/suite/binlog/t/binlog_index.test 1232share/mysql-test/suite/binlog/t/binlog_index.test
1230share/mysql-test/suite/binlog/t/binlog_innodb.test 1233share/mysql-test/suite/binlog/t/binlog_innodb.test
1231share/mysql-test/suite/binlog/t/binlog_innodb_row.test 1234share/mysql-test/suite/binlog/t/binlog_innodb_row.test
1232share/mysql-test/suite/binlog/t/binlog_killed.test 1235share/mysql-test/suite/binlog/t/binlog_killed.test
1233share/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt 1236share/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt
1234share/mysql-test/suite/binlog/t/binlog_killed_simulate.test 1237share/mysql-test/suite/binlog/t/binlog_killed_simulate.test
1235share/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test 1238share/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
1236share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test 1239share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
1237share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test 1240share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test
1238share/mysql-test/suite/binlog/t/binlog_multi_engine.test 1241share/mysql-test/suite/binlog/t/binlog_multi_engine.test
1239share/mysql-test/suite/binlog/t/binlog_old_versions.test 1242share/mysql-test/suite/binlog/t/binlog_old_versions.test
1240share/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt 1243share/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
1241share/mysql-test/suite/binlog/t/binlog_row_binlog.test 1244share/mysql-test/suite/binlog/t/binlog_row_binlog.test
@@ -2718,26 +2721,27 @@ share/mysql-test/suite/innodb/t/innodb_m @@ -2718,26 +2721,27 @@ share/mysql-test/suite/innodb/t/innodb_m
2718share/mysql-test/suite/innodb/t/innodb_mysql_rbk.test 2721share/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
2719share/mysql-test/suite/innodb/t/innodb_notembedded.test 2722share/mysql-test/suite/innodb/t/innodb_notembedded.test
2720share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt 2723share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
2721share/mysql-test/suite/innodb/t/innodb_timeout_rollback.test 2724share/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
2722share/mysql-test/suite/innodb/t/innodb_trx_weight.test 2725share/mysql-test/suite/innodb/t/innodb_trx_weight.test
2723share/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc 2726share/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc
2724share/mysql-test/suite/innodb_plugin/include/innodb-index.inc 2727share/mysql-test/suite/innodb_plugin/include/innodb-index.inc
2725share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc 2728share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
2726share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result 2729share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result
2727share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result 2730share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
2728share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result 2731share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
2729share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result 2732share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
2730share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result 2733share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
 2734share/mysql-test/suite/innodb_plugin/r/innodb-create-options.result
2731share/mysql-test/suite/innodb_plugin/r/innodb-index.result 2735share/mysql-test/suite/innodb_plugin/r/innodb-index.result
2732share/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result 2736share/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result
2733share/mysql-test/suite/innodb_plugin/r/innodb-lock.result 2737share/mysql-test/suite/innodb_plugin/r/innodb-lock.result
2734share/mysql-test/suite/innodb_plugin/r/innodb-replace.result 2738share/mysql-test/suite/innodb_plugin/r/innodb-replace.result
2735share/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result 2739share/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result
2736share/mysql-test/suite/innodb_plugin/r/innodb-timeout.result 2740share/mysql-test/suite/innodb_plugin/r/innodb-timeout.result
2737share/mysql-test/suite/innodb_plugin/r/innodb-ucs2.result 2741share/mysql-test/suite/innodb_plugin/r/innodb-ucs2.result
2738share/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result 2742share/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result
2739share/mysql-test/suite/innodb_plugin/r/innodb-zip.result 2743share/mysql-test/suite/innodb_plugin/r/innodb-zip.result
2740share/mysql-test/suite/innodb_plugin/r/innodb.result 2744share/mysql-test/suite/innodb_plugin/r/innodb.result
2741share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result 2745share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
2742share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result 2746share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
2743share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result 2747share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
@@ -2760,58 +2764,58 @@ share/mysql-test/suite/innodb_plugin/r/i @@ -2760,58 +2764,58 @@ share/mysql-test/suite/innodb_plugin/r/i
2760share/mysql-test/suite/innodb_plugin/r/innodb_bug45357.result 2764share/mysql-test/suite/innodb_plugin/r/innodb_bug45357.result
2761share/mysql-test/suite/innodb_plugin/r/innodb_bug46000.result 2765share/mysql-test/suite/innodb_plugin/r/innodb_bug46000.result
2762share/mysql-test/suite/innodb_plugin/r/innodb_bug46676.result 2766share/mysql-test/suite/innodb_plugin/r/innodb_bug46676.result
2763share/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result 2767share/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
2764share/mysql-test/suite/innodb_plugin/r/innodb_bug47621.result 2768share/mysql-test/suite/innodb_plugin/r/innodb_bug47621.result
2765share/mysql-test/suite/innodb_plugin/r/innodb_bug47622.result 2769share/mysql-test/suite/innodb_plugin/r/innodb_bug47622.result
2766share/mysql-test/suite/innodb_plugin/r/innodb_bug47777.result 2770share/mysql-test/suite/innodb_plugin/r/innodb_bug47777.result
2767share/mysql-test/suite/innodb_plugin/r/innodb_bug48024.result 2771share/mysql-test/suite/innodb_plugin/r/innodb_bug48024.result
2768share/mysql-test/suite/innodb_plugin/r/innodb_bug49164.result 2772share/mysql-test/suite/innodb_plugin/r/innodb_bug49164.result
2769share/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result 2773share/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result
2770share/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 2774share/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
2771share/mysql-test/suite/innodb_plugin/r/innodb_bug52663.result 2775share/mysql-test/suite/innodb_plugin/r/innodb_bug52663.result
2772share/mysql-test/suite/innodb_plugin/r/innodb_bug52745.result 2776share/mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
 2777share/mysql-test/suite/innodb_plugin/r/innodb_bug53046.result
2773share/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result 2778share/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
2774share/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result 2779share/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
2775share/mysql-test/suite/innodb_plugin/r/innodb_bug53592.result 2780share/mysql-test/suite/innodb_plugin/r/innodb_bug53592.result
2776share/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result 2781share/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result
2777share/mysql-test/suite/innodb_plugin/r/innodb_bug53756.result 2782share/mysql-test/suite/innodb_plugin/r/innodb_bug53756.result
2778share/mysql-test/suite/innodb_plugin/r/innodb_bug54044.result 2783share/mysql-test/suite/innodb_plugin/r/innodb_bug54044.result
2779share/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result 2784share/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
2780share/mysql-test/suite/innodb_plugin/r/innodb_bug54679.result 
2781share/mysql-test/suite/innodb_plugin/r/innodb_bug56143.result 2785share/mysql-test/suite/innodb_plugin/r/innodb_bug56143.result
2782share/mysql-test/suite/innodb_plugin/r/innodb_bug56632.result 
2783share/mysql-test/suite/innodb_plugin/r/innodb_bug56680.result 2786share/mysql-test/suite/innodb_plugin/r/innodb_bug56680.result
2784share/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result 2787share/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result
2785share/mysql-test/suite/innodb_plugin/r/innodb_bug56947.result 2788share/mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
2786share/mysql-test/suite/innodb_plugin/r/innodb_bug57252.result 2789share/mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
2787share/mysql-test/suite/innodb_plugin/r/innodb_bug57255.result 2790share/mysql-test/suite/innodb_plugin/r/innodb_bug57255.result
2788share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result 2791share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
2789share/mysql-test/suite/innodb_plugin/r/innodb_gis.result 2792share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
2790share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result 2793share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
2791share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result 2794share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
2792share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result 2795share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
2793share/mysql-test/suite/innodb_plugin/r/innodb_mysql.result 2796share/mysql-test/suite/innodb_plugin/r/innodb_mysql.result
2794share/mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result 2797share/mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result
2795share/mysql-test/suite/innodb_plugin/r/innodb_notembedded.result 2798share/mysql-test/suite/innodb_plugin/r/innodb_notembedded.result
2796share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result 2799share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
2797share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result 2800share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
2798share/mysql-test/suite/innodb_plugin/t/disabled.def 2801share/mysql-test/suite/innodb_plugin/t/disabled.def
2799share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test 2802share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
2800share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test 2803share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
2801share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test 2804share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
2802share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test 2805share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
2803share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt 2806share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
2804share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test 2807share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
 2808share/mysql-test/suite/innodb_plugin/t/innodb-create-options.test
2805share/mysql-test/suite/innodb_plugin/t/innodb-index.test 2809share/mysql-test/suite/innodb_plugin/t/innodb-index.test
2806share/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test 2810share/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
2807share/mysql-test/suite/innodb_plugin/t/innodb-lock.test 2811share/mysql-test/suite/innodb_plugin/t/innodb-lock.test
2808share/mysql-test/suite/innodb_plugin/t/innodb-master.opt 2812share/mysql-test/suite/innodb_plugin/t/innodb-master.opt
2809share/mysql-test/suite/innodb_plugin/t/innodb-replace.test 2813share/mysql-test/suite/innodb_plugin/t/innodb-replace.test
2810share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt 2814share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt
2811share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test 2815share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test
2812share/mysql-test/suite/innodb_plugin/t/innodb-timeout.test 2816share/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
2813share/mysql-test/suite/innodb_plugin/t/innodb-ucs2.test 2817share/mysql-test/suite/innodb_plugin/t/innodb-ucs2.test
2814share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt 2818share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt
2815share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test 2819share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test
2816share/mysql-test/suite/innodb_plugin/t/innodb-zip.test 2820share/mysql-test/suite/innodb_plugin/t/innodb-zip.test
2817share/mysql-test/suite/innodb_plugin/t/innodb.test 2821share/mysql-test/suite/innodb_plugin/t/innodb.test
@@ -2841,38 +2845,37 @@ share/mysql-test/suite/innodb_plugin/t/i @@ -2841,38 +2845,37 @@ share/mysql-test/suite/innodb_plugin/t/i
2841share/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test 2845share/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
2842share/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test 2846share/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test
2843share/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test 2847share/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test
2844share/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test 2848share/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
2845share/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test 2849share/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test
2846share/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test 2850share/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test
2847share/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test 2851share/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test
2848share/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test 2852share/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test
2849share/mysql-test/suite/innodb_plugin/t/innodb_bug49164.test 2853share/mysql-test/suite/innodb_plugin/t/innodb_bug49164.test
2850share/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test 2854share/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test
2851share/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 2855share/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
2852share/mysql-test/suite/innodb_plugin/t/innodb_bug52663.test 2856share/mysql-test/suite/innodb_plugin/t/innodb_bug52663.test
2853share/mysql-test/suite/innodb_plugin/t/innodb_bug52745.test 2857share/mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
 2858share/mysql-test/suite/innodb_plugin/t/innodb_bug53046.test
2854share/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test 2859share/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
2855share/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test 2860share/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
2856share/mysql-test/suite/innodb_plugin/t/innodb_bug53592.test 2861share/mysql-test/suite/innodb_plugin/t/innodb_bug53592.test
2857share/mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt 2862share/mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt
2858share/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test 2863share/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test
2859share/mysql-test/suite/innodb_plugin/t/innodb_bug53756-master.opt 2864share/mysql-test/suite/innodb_plugin/t/innodb_bug53756-master.opt
2860share/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test 2865share/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
2861share/mysql-test/suite/innodb_plugin/t/innodb_bug54044.test 2866share/mysql-test/suite/innodb_plugin/t/innodb_bug54044.test
2862share/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test 2867share/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
2863share/mysql-test/suite/innodb_plugin/t/innodb_bug54679.test 
2864share/mysql-test/suite/innodb_plugin/t/innodb_bug56143.test 2868share/mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
2865share/mysql-test/suite/innodb_plugin/t/innodb_bug56632.test 
2866share/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test 2869share/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
2867share/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test 2870share/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test
2868share/mysql-test/suite/innodb_plugin/t/innodb_bug56947.test 2871share/mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
2869share/mysql-test/suite/innodb_plugin/t/innodb_bug57252.test 2872share/mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
2870share/mysql-test/suite/innodb_plugin/t/innodb_bug57255.test 2873share/mysql-test/suite/innodb_plugin/t/innodb_bug57255.test
2871share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test 2874share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
2872share/mysql-test/suite/innodb_plugin/t/innodb_gis.test 2875share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
2873share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test 2876share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
2874share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt 2877share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
2875share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test 2878share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
2876share/mysql-test/suite/innodb_plugin/t/innodb_multi_update.test 2879share/mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
2877share/mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt 2880share/mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt
2878share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test 2881share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test
@@ -3857,26 +3860,27 @@ share/mysql-test/suite/rpl/t/rpl_circula @@ -3857,26 +3860,27 @@ share/mysql-test/suite/rpl/t/rpl_circula
3857share/mysql-test/suite/rpl/t/rpl_colSize.test 3860share/mysql-test/suite/rpl/t/rpl_colSize.test
3858share/mysql-test/suite/rpl/t/rpl_commit_after_flush.test 3861share/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
3859share/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt 3862share/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt
3860share/mysql-test/suite/rpl/t/rpl_concurrency_error.test 3863share/mysql-test/suite/rpl/t/rpl_concurrency_error.test
3861share/mysql-test/suite/rpl/t/rpl_conditional_comments.test 3864share/mysql-test/suite/rpl/t/rpl_conditional_comments.test
3862share/mysql-test/suite/rpl/t/rpl_create_database-master.opt 3865share/mysql-test/suite/rpl/t/rpl_create_database-master.opt
3863share/mysql-test/suite/rpl/t/rpl_create_database-slave.opt 3866share/mysql-test/suite/rpl/t/rpl_create_database-slave.opt
3864share/mysql-test/suite/rpl/t/rpl_create_database.test 3867share/mysql-test/suite/rpl/t/rpl_create_database.test
3865share/mysql-test/suite/rpl/t/rpl_create_if_not_exists.test 3868share/mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
3866share/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test 3869share/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test
3867share/mysql-test/suite/rpl/t/rpl_critical_errors.test 3870share/mysql-test/suite/rpl/t/rpl_critical_errors.test
3868share/mysql-test/suite/rpl/t/rpl_cross_version-master.opt 3871share/mysql-test/suite/rpl/t/rpl_cross_version-master.opt
3869share/mysql-test/suite/rpl/t/rpl_cross_version.test 3872share/mysql-test/suite/rpl/t/rpl_cross_version.test
 3873share/mysql-test/suite/rpl/t/rpl_current_user-master.opt
3870share/mysql-test/suite/rpl/t/rpl_current_user.cnf 3874share/mysql-test/suite/rpl/t/rpl_current_user.cnf
3871share/mysql-test/suite/rpl/t/rpl_current_user.test 3875share/mysql-test/suite/rpl/t/rpl_current_user.test
3872share/mysql-test/suite/rpl/t/rpl_ddl.test 3876share/mysql-test/suite/rpl/t/rpl_ddl.test
3873share/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt 3877share/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
3874share/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test 3878share/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
3875share/mysql-test/suite/rpl/t/rpl_delete_no_where.test 3879share/mysql-test/suite/rpl/t/rpl_delete_no_where.test
3876share/mysql-test/suite/rpl/t/rpl_do_grant.test 3880share/mysql-test/suite/rpl/t/rpl_do_grant.test
3877share/mysql-test/suite/rpl/t/rpl_drop.test 3881share/mysql-test/suite/rpl/t/rpl_drop.test
3878share/mysql-test/suite/rpl/t/rpl_drop_db.test 3882share/mysql-test/suite/rpl/t/rpl_drop_db.test
3879share/mysql-test/suite/rpl/t/rpl_drop_if_exists.test 3883share/mysql-test/suite/rpl/t/rpl_drop_if_exists.test
3880share/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt 3884share/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
3881share/mysql-test/suite/rpl/t/rpl_drop_temp.test 3885share/mysql-test/suite/rpl/t/rpl_drop_temp.test
3882share/mysql-test/suite/rpl/t/rpl_drop_view.test 3886share/mysql-test/suite/rpl/t/rpl_drop_view.test
@@ -4088,26 +4092,27 @@ share/mysql-test/suite/rpl/t/rpl_server_ @@ -4088,26 +4092,27 @@ share/mysql-test/suite/rpl/t/rpl_server_
4088share/mysql-test/suite/rpl/t/rpl_server_id2.test 4092share/mysql-test/suite/rpl/t/rpl_server_id2.test
4089share/mysql-test/suite/rpl/t/rpl_session_var.test 4093share/mysql-test/suite/rpl/t/rpl_session_var.test
4090share/mysql-test/suite/rpl/t/rpl_set_charset.test 4094share/mysql-test/suite/rpl/t/rpl_set_charset.test
4091share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test 4095share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
4092share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test 4096share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
4093share/mysql-test/suite/rpl/t/rpl_sf.test 4097share/mysql-test/suite/rpl/t/rpl_sf.test
4094share/mysql-test/suite/rpl/t/rpl_show_slave_running.test 4098share/mysql-test/suite/rpl/t/rpl_show_slave_running.test
4095share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt 4099share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
4096share/mysql-test/suite/rpl/t/rpl_skip_error.test 4100share/mysql-test/suite/rpl/t/rpl_skip_error.test
4097share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test 4101share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
4098share/mysql-test/suite/rpl/t/rpl_slave_load_in.test 4102share/mysql-test/suite/rpl/t/rpl_slave_load_in.test
4099share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt 4103share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
4100share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test 4104share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
 4105share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
4101share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt 4106share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
4102share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test 4107share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
4103share/mysql-test/suite/rpl/t/rpl_slave_skip.test 4108share/mysql-test/suite/rpl/t/rpl_slave_skip.test
4104share/mysql-test/suite/rpl/t/rpl_slave_status.test 4109share/mysql-test/suite/rpl/t/rpl_slave_status.test
4105share/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt 4110share/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
4106share/mysql-test/suite/rpl/t/rpl_slow_query_log.test 4111share/mysql-test/suite/rpl/t/rpl_slow_query_log.test
4107share/mysql-test/suite/rpl/t/rpl_sp-master.opt 4112share/mysql-test/suite/rpl/t/rpl_sp-master.opt
4108share/mysql-test/suite/rpl/t/rpl_sp-slave.opt 4113share/mysql-test/suite/rpl/t/rpl_sp-slave.opt
4109share/mysql-test/suite/rpl/t/rpl_sp.test 4114share/mysql-test/suite/rpl/t/rpl_sp.test
4110share/mysql-test/suite/rpl/t/rpl_sp004.test 4115share/mysql-test/suite/rpl/t/rpl_sp004.test
4111share/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt 4116share/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
4112share/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt 4117share/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
4113share/mysql-test/suite/rpl/t/rpl_sp_effects.test 4118share/mysql-test/suite/rpl/t/rpl_sp_effects.test
cvs diff -r1.13 -r1.14 pkgsrc/databases/mysql51-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/distinfo 2010/11/26 13:52:58 1.13
+++ pkgsrc/databases/mysql51-server/Attic/distinfo 2010/12/16 03:42:50 1.14
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.13 2010/11/26 13:52:58 taca Exp $ 1$NetBSD: distinfo,v 1.14 2010/12/16 03:42:50 taca Exp $
2 2
3SHA1 (mysql-5.1.53.tar.gz) = 24064a4c0f8b88b30acb6ddb03f32e897ef061f3 3SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
4RMD160 (mysql-5.1.53.tar.gz) = e8fd69450dda85cf3f41269e6e3fca05caccc76d 4RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
5Size (mysql-5.1.53.tar.gz) = 23871815 bytes 5Size (mysql-5.1.54.tar.gz) = 23672236 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
7SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405 7SHA1 (patch-ab) = 1fc6939bb3021153b72479aa2413e50940878c98
8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
10SHA1 (patch-ae) = e682e8c7a260706cbfd802885bfe100c0e0d31be 10SHA1 (patch-ae) = e682e8c7a260706cbfd802885bfe100c0e0d31be
11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23 11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23
12SHA1 (patch-ag) = 85df1a0080376c5aff1a963e5532cb2c1ec5949d 12SHA1 (patch-ag) = 85df1a0080376c5aff1a963e5532cb2c1ec5949d
13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32 13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32
14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492 14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492
15SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db 15SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db
16SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641 16SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641
17SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247 17SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247
18SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb 18SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb
19SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d 19SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d
20SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51 20SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/patches/Attic/patch-ab 2010/03/21 14:41:41 1.2
+++ pkgsrc/databases/mysql51-server/patches/Attic/patch-ab 2010/12/16 03:42:50 1.3
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: patch-ab,v 1.2 2010/03/21 14:41:41 taca Exp $ 1$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:50 taca Exp $
2 2
3--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000 3--- Makefile.in.orig 2010-11-29 10:42:58.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -407,14 +407,10 @@ AUTOMAKE_OPTIONS = foreign 5@@ -407,13 +407,10 @@ AUTOMAKE_OPTIONS = foreign
6 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 6 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
7 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt 7 README COPYING CMakeLists.txt
8  8
9-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 9-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
10- @readline_topdir@ sql-common scripts \ 10- @readline_topdir@ sql-common scripts \
11- @pstack_dir@ \ 
12- @sql_union_dirs@ unittest \ 11- @sql_union_dirs@ unittest \
13- @sql_server@ @man_dirs@ tests \ 12- @sql_server@ @man_dirs@ tests \
14- netware @libmysqld_dirs@ \ 13- netware @libmysqld_dirs@ \
15- mysql-test support-files sql-bench @tools_dirs@ \ 14- mysql-test support-files sql-bench @tools_dirs@ \
16- win 15- win
17+SUBDIRS = . include scripts @pstack_dir@ \ 16+SUBDIRS = . include scripts \
18+ strings mysys dbug extra regex storage plugin \ 17+ strings mysys dbug extra regex storage plugin \
19+ libmysql @sql_server@ @man_dirs@ tests \ 18+ libmysql @sql_server@ @man_dirs@ tests \
20+ @libmysqld_dirs@ mysql-test support-files @tools_dirs@ 19+ @libmysqld_dirs@ mysql-test support-files @tools_dirs@
21  20
22 DIST_SUBDIRS = . include Docs zlib \ 21 DIST_SUBDIRS = . include Docs zlib \
23 cmd-line-utils sql-common scripts \ 22 cmd-line-utils sql-common scripts \