Wed Jun 15 21:00:06 2011 UTC ()
Changes 5.5.13:
* InnoDB Storage Engine: If the server crashed while an XA transaction was
  prepared but not yet committed, the transaction could remain in the system
  after restart, and cause a subsequent shutdown to hang.
* InnoDB Storage Engine: Similar problem to the foreign key error in bug
  11831040 / 60196 / 60909, but with a different root cause and occurring on
  Mac OS X. With the setting lower_case_table_names=2, inserts into InnoDB
  tables covered by foreign key constraints could fail after a server restart.
* Partitioning: The internal get_partition_set() function did not take into
  account the possibility that a key specification could be NULL in some cases.
* Partitioning: When executing a row-ordered retrieval index merge, the
  partitioning handler used memory from from that allocated for the table,
  rather than that allocated to the query, causing table object memory not to
  be freed until the table was closed.
* Replication: A spurious error malformed binlog: it does not contain any
  Format_description_log_event... was generated when mysqlbinlog was invoked
  using --base64-output=decode-row and --start-position=pos, where pos is a
  point in the binary log past the format description log event. However, there
  is nothing unsafe about not printing the format description log event, so the
  error has been removed for this case.
* Replication: Typographical errors appeared in the text of several replication  error messages. (The word ���position��� was misspelled as ���postion���.)
* Assignments to NEW.var_name within triggers, where var_name had a BLOB or
  TEXT type, were not properly handled and produced incorrect results.
* XA COMMIT could fail to clean up the error state if it discovered that the
  current XA transaction had to be rolled back. Consequently, the next XA
  transaction could raise an assertion when it checked for proper cleanup of
  the previous transaction.
* An internal client macro reference was removed from the client_plugin.h
  header file. This reference made the file unusable.
* The server consumed memory for repeated invocation of some stored procedures,
  which was not released until the connection terminated.
* The server did not check for certain invalid out of order sequences of XA
  statements, and these sequences raised an assertion.
* With the conversion from GNU autotools to CMake for configuring MySQL, the
  USE_SYMDIR preprocessor symbol was omitted. This caused failure of symbolic
  links (described at Section 7.11.3.1, ���Using Symbolic Links���).


(adam)
diff -r1.5 -r1.6 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.2 -r1.3 pkgsrc/databases/mysql55-client/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/mysql55-server/PLIST

cvs diff -r1.5 -r1.6 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2011/05/09 13:06:28 1.5
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2011/06/15 21:00:05 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.5 2011/05/09 13:06:28 adam Exp $ 1# $NetBSD: Makefile.common,v 1.6 2011/06/15 21:00:05 adam Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.12 6DISTNAME= mysql-5.5.13
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 16DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
17PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 17PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches
18 18
19USE_CMAKE= yes 19USE_CMAKE= yes

cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/distinfo 2011/05/07 04:03:07 1.2
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2011/06/15 21:00:05 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.2 2011/05/07 04:03:07 adam Exp $ 1$NetBSD: distinfo,v 1.3 2011/06/15 21:00:05 adam Exp $
2 2
3SHA1 (mysql-5.5.12.tar.gz) = 8a4f4c2b762676140722d414d694cddd9c1e3397 3SHA1 (mysql-5.5.13.tar.gz) = ccfb58c87e045e6679b442c6230cac222e73f740
4RMD160 (mysql-5.5.12.tar.gz) = e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 4RMD160 (mysql-5.5.13.tar.gz) = 5e249f533be51a8cb6d777edf630ecd82f5e68a0
5Size (mysql-5.5.12.tar.gz) = 23681636 bytes 5Size (mysql-5.5.13.tar.gz) = 23709591 bytes
6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
7SHA1 (patch-CMakeLists.txt) = eaf78f2198945b5010dc3e67e13bdb37fd9c12c7 7SHA1 (patch-CMakeLists.txt) = eaf78f2198945b5010dc3e67e13bdb37fd9c12c7
8SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 8SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
9SHA1 (patch-client_mysqladmin.cc) = 901c2b675cff7589ab629e591dabf26d17e4d8a7 9SHA1 (patch-client_mysqladmin.cc) = 901c2b675cff7589ab629e591dabf26d17e4d8a7
10SHA1 (patch-client_mysqlbinlog.cc) = f78dd6538b978e1ae95bb720e8baa91087ecc149 10SHA1 (patch-client_mysqlbinlog.cc) = f78dd6538b978e1ae95bb720e8baa91087ecc149
11SHA1 (patch-client_sql_string.cc) = 4a18442fa16ccbc8f34c11a460209209017c3bc5 11SHA1 (patch-client_sql_string.cc) = 4a18442fa16ccbc8f34c11a460209209017c3bc5
12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
13SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 13SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
14SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 14SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
15SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 15SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
16SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 16SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
17SHA1 (patch-include_myisam.h) = cfbec9eee43282c5ebc38a64add97218c74279a0 17SHA1 (patch-include_myisam.h) = cfbec9eee43282c5ebc38a64add97218c74279a0
18SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 18SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892

cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql55-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/PLIST 2011/05/07 04:03:08 1.3
+++ pkgsrc/databases/mysql55-server/Attic/PLIST 2011/06/15 21:00:06 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2011/05/07 04:03:08 adam Exp $ 1@comment $NetBSD: PLIST,v 1.4 2011/06/15 21:00:06 adam 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
8${PLIST.embedded}bin/mysql_client_test_embedded 8${PLIST.embedded}bin/mysql_client_test_embedded
9bin/mysql_tzinfo_to_sql 9bin/mysql_tzinfo_to_sql
10bin/mysql_waitpid 10bin/mysql_waitpid
11${PLIST.embedded}bin/mysqltest_embedded 11${PLIST.embedded}bin/mysqltest_embedded
12bin/perror 12bin/perror
13bin/replace 13bin/replace
14bin/resolve_stack_dump 14bin/resolve_stack_dump
@@ -1429,26 +1429,28 @@ share/mysql/test/std_data/rpl_timezone.d @@ -1429,26 +1429,28 @@ share/mysql/test/std_data/rpl_timezone.d
1429share/mysql/test/std_data/rpl_timezone2.dat 1429share/mysql/test/std_data/rpl_timezone2.dat
1430share/mysql/test/std_data/server-cert.pem 1430share/mysql/test/std_data/server-cert.pem
1431share/mysql/test/std_data/server-key.pem 1431share/mysql/test/std_data/server-key.pem
1432share/mysql/test/std_data/server8k-cert.pem 1432share/mysql/test/std_data/server8k-cert.pem
1433share/mysql/test/std_data/server8k-key.pem 1433share/mysql/test/std_data/server8k-key.pem
1434share/mysql/test/std_data/trunc_binlog.000001 1434share/mysql/test/std_data/trunc_binlog.000001
1435share/mysql/test/std_data/untrusted-cacert.pem 1435share/mysql/test/std_data/untrusted-cacert.pem
1436share/mysql/test/std_data/vchar.frm 1436share/mysql/test/std_data/vchar.frm
1437share/mysql/test/std_data/warnings_loaddata.dat 1437share/mysql/test/std_data/warnings_loaddata.dat
1438share/mysql/test/std_data/words.dat 1438share/mysql/test/std_data/words.dat
1439share/mysql/test/std_data/words2.dat 1439share/mysql/test/std_data/words2.dat
1440share/mysql/test/suite/binlog/combinations 1440share/mysql/test/suite/binlog/combinations
1441share/mysql/test/suite/binlog/r/binlog_base64_flag.result 1441share/mysql/test/suite/binlog/r/binlog_base64_flag.result
 1442share/mysql/test/suite/binlog/r/binlog_bug23533.result
 1443share/mysql/test/suite/binlog/r/binlog_bug36391.result
1442share/mysql/test/suite/binlog/r/binlog_database.result 1444share/mysql/test/suite/binlog/r/binlog_database.result
1443share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result 1445share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result
1444share/mysql/test/suite/binlog/r/binlog_drop_if_exists.result 1446share/mysql/test/suite/binlog/r/binlog_drop_if_exists.result
1445share/mysql/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result 1447share/mysql/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
1446share/mysql/test/suite/binlog/r/binlog_grant.result 1448share/mysql/test/suite/binlog/r/binlog_grant.result
1447share/mysql/test/suite/binlog/r/binlog_implicit_commit.result 1449share/mysql/test/suite/binlog/r/binlog_implicit_commit.result
1448share/mysql/test/suite/binlog/r/binlog_incident.result 1450share/mysql/test/suite/binlog/r/binlog_incident.result
1449share/mysql/test/suite/binlog/r/binlog_index.result 1451share/mysql/test/suite/binlog/r/binlog_index.result
1450share/mysql/test/suite/binlog/r/binlog_innodb.result 1452share/mysql/test/suite/binlog/r/binlog_innodb.result
1451share/mysql/test/suite/binlog/r/binlog_innodb_row.result 1453share/mysql/test/suite/binlog/r/binlog_innodb_row.result
1452share/mysql/test/suite/binlog/r/binlog_killed.result 1454share/mysql/test/suite/binlog/r/binlog_killed.result
1453share/mysql/test/suite/binlog/r/binlog_killed_simulate.result 1455share/mysql/test/suite/binlog/r/binlog_killed_simulate.result
1454share/mysql/test/suite/binlog/r/binlog_max_extension.result 1456share/mysql/test/suite/binlog/r/binlog_max_extension.result
@@ -1495,26 +1497,29 @@ share/mysql/test/suite/binlog/r/binlog_u @@ -1495,26 +1497,29 @@ share/mysql/test/suite/binlog/r/binlog_u
1495share/mysql/test/suite/binlog/r/binlog_write_error.result 1497share/mysql/test/suite/binlog/r/binlog_write_error.result
1496share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001 1498share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001
1497share/mysql/test/suite/binlog/std_data/bug32407.001 1499share/mysql/test/suite/binlog/std_data/bug32407.001
1498share/mysql/test/suite/binlog/std_data/update-full-row.binlog 1500share/mysql/test/suite/binlog/std_data/update-full-row.binlog
1499share/mysql/test/suite/binlog/std_data/update-partial-row.binlog 1501share/mysql/test/suite/binlog/std_data/update-partial-row.binlog
1500share/mysql/test/suite/binlog/std_data/ver_5_1-telco.001 1502share/mysql/test/suite/binlog/std_data/ver_5_1-telco.001
1501share/mysql/test/suite/binlog/std_data/ver_5_1-wl2325_r.001 1503share/mysql/test/suite/binlog/std_data/ver_5_1-wl2325_r.001
1502share/mysql/test/suite/binlog/std_data/ver_5_1-wl2325_s.001 1504share/mysql/test/suite/binlog/std_data/ver_5_1-wl2325_s.001
1503share/mysql/test/suite/binlog/std_data/ver_5_1_17.001 1505share/mysql/test/suite/binlog/std_data/ver_5_1_17.001
1504share/mysql/test/suite/binlog/std_data/ver_5_1_23.001 1506share/mysql/test/suite/binlog/std_data/ver_5_1_23.001
1505share/mysql/test/suite/binlog/std_data/write-full-row.binlog 1507share/mysql/test/suite/binlog/std_data/write-full-row.binlog
1506share/mysql/test/suite/binlog/std_data/write-partial-row.binlog 1508share/mysql/test/suite/binlog/std_data/write-partial-row.binlog
1507share/mysql/test/suite/binlog/t/binlog_base64_flag.test 1509share/mysql/test/suite/binlog/t/binlog_base64_flag.test
 1510share/mysql/test/suite/binlog/t/binlog_bug23533.test
 1511share/mysql/test/suite/binlog/t/binlog_bug36391-master.opt
 1512share/mysql/test/suite/binlog/t/binlog_bug36391.test
1508share/mysql/test/suite/binlog/t/binlog_database.test 1513share/mysql/test/suite/binlog/t/binlog_database.test
1509share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test 1514share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test
1510share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test 1515share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test
1511share/mysql/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test 1516share/mysql/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
1512share/mysql/test/suite/binlog/t/binlog_grant.test 1517share/mysql/test/suite/binlog/t/binlog_grant.test
1513share/mysql/test/suite/binlog/t/binlog_implicit_commit.test 1518share/mysql/test/suite/binlog/t/binlog_implicit_commit.test
1514share/mysql/test/suite/binlog/t/binlog_incident-master.opt 1519share/mysql/test/suite/binlog/t/binlog_incident-master.opt
1515share/mysql/test/suite/binlog/t/binlog_incident.test 1520share/mysql/test/suite/binlog/t/binlog_incident.test
1516share/mysql/test/suite/binlog/t/binlog_index-master.opt 1521share/mysql/test/suite/binlog/t/binlog_index-master.opt
1517share/mysql/test/suite/binlog/t/binlog_index.test 1522share/mysql/test/suite/binlog/t/binlog_index.test
1518share/mysql/test/suite/binlog/t/binlog_innodb.test 1523share/mysql/test/suite/binlog/t/binlog_innodb.test
1519share/mysql/test/suite/binlog/t/binlog_innodb_row.test 1524share/mysql/test/suite/binlog/t/binlog_innodb_row.test
1520share/mysql/test/suite/binlog/t/binlog_killed.test 1525share/mysql/test/suite/binlog/t/binlog_killed.test
@@ -1565,48 +1570,26 @@ share/mysql/test/suite/binlog/t/binlog_s @@ -1565,48 +1570,26 @@ share/mysql/test/suite/binlog/t/binlog_s
1565share/mysql/test/suite/binlog/t/binlog_stm_row.test 1570share/mysql/test/suite/binlog/t/binlog_stm_row.test
1566share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt 1571share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt
1567share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning.test 1572share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning.test
1568share/mysql/test/suite/binlog/t/binlog_stm_user_variables.test 1573share/mysql/test/suite/binlog/t/binlog_stm_user_variables.test
1569share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test 1574share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test
1570share/mysql/test/suite/binlog/t/binlog_tmp_table.test 1575share/mysql/test/suite/binlog/t/binlog_tmp_table.test
1571share/mysql/test/suite/binlog/t/binlog_truncate_innodb-master.opt 1576share/mysql/test/suite/binlog/t/binlog_truncate_innodb-master.opt
1572share/mysql/test/suite/binlog/t/binlog_truncate_innodb.test 1577share/mysql/test/suite/binlog/t/binlog_truncate_innodb.test
1573share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test 1578share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test
1574share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt 1579share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt
1575share/mysql/test/suite/binlog/t/binlog_unsafe.test 1580share/mysql/test/suite/binlog/t/binlog_unsafe.test
1576share/mysql/test/suite/binlog/t/binlog_write_error.test 1581share/mysql/test/suite/binlog/t/binlog_write_error.test
1577share/mysql/test/suite/binlog/t/disabled.def 1582share/mysql/test/suite/binlog/t/disabled.def
1578share/mysql/test/suite/bugs/combinations 
1579share/mysql/test/suite/bugs/data/rpl_bug12691.dat 
1580share/mysql/test/suite/bugs/r/bug57108.result 
1581share/mysql/test/suite/bugs/r/rpl_bug12691.result 
1582share/mysql/test/suite/bugs/r/rpl_bug23533.result 
1583share/mysql/test/suite/bugs/r/rpl_bug31582.result 
1584share/mysql/test/suite/bugs/r/rpl_bug31583.result 
1585share/mysql/test/suite/bugs/r/rpl_bug33029.result 
1586share/mysql/test/suite/bugs/r/rpl_bug36391.result 
1587share/mysql/test/suite/bugs/r/rpl_bug37426.result 
1588share/mysql/test/suite/bugs/r/rpl_bug38205.result 
1589share/mysql/test/suite/bugs/t/bug57108-master.opt 
1590share/mysql/test/suite/bugs/t/bug57108.test 
1591share/mysql/test/suite/bugs/t/rpl_bug12691.test 
1592share/mysql/test/suite/bugs/t/rpl_bug23533.test 
1593share/mysql/test/suite/bugs/t/rpl_bug31582.test 
1594share/mysql/test/suite/bugs/t/rpl_bug31583.test 
1595share/mysql/test/suite/bugs/t/rpl_bug33029.test 
1596share/mysql/test/suite/bugs/t/rpl_bug36391-master.opt 
1597share/mysql/test/suite/bugs/t/rpl_bug36391.test 
1598share/mysql/test/suite/bugs/t/rpl_bug37426.test 
1599share/mysql/test/suite/bugs/t/rpl_bug38205.test 
1600share/mysql/test/suite/engines/README 1583share/mysql/test/suite/engines/README
1601share/mysql/test/suite/engines/funcs/r/ai_init_alter_table.result 1584share/mysql/test/suite/engines/funcs/r/ai_init_alter_table.result
1602share/mysql/test/suite/engines/funcs/r/ai_init_create_table.result 1585share/mysql/test/suite/engines/funcs/r/ai_init_create_table.result
1603share/mysql/test/suite/engines/funcs/r/ai_init_insert.result 1586share/mysql/test/suite/engines/funcs/r/ai_init_insert.result
1604share/mysql/test/suite/engines/funcs/r/ai_init_insert_id.result 1587share/mysql/test/suite/engines/funcs/r/ai_init_insert_id.result
1605share/mysql/test/suite/engines/funcs/r/ai_overflow_error.result 1588share/mysql/test/suite/engines/funcs/r/ai_overflow_error.result
1606share/mysql/test/suite/engines/funcs/r/ai_reset_by_truncate.result 1589share/mysql/test/suite/engines/funcs/r/ai_reset_by_truncate.result
1607share/mysql/test/suite/engines/funcs/r/ai_sql_auto_is_null.result 1590share/mysql/test/suite/engines/funcs/r/ai_sql_auto_is_null.result
1608share/mysql/test/suite/engines/funcs/r/an_calendar.result 1591share/mysql/test/suite/engines/funcs/r/an_calendar.result
1609share/mysql/test/suite/engines/funcs/r/an_number.result 1592share/mysql/test/suite/engines/funcs/r/an_number.result
1610share/mysql/test/suite/engines/funcs/r/an_string.result 1593share/mysql/test/suite/engines/funcs/r/an_string.result
1611share/mysql/test/suite/engines/funcs/r/comment_column.result 1594share/mysql/test/suite/engines/funcs/r/comment_column.result
1612share/mysql/test/suite/engines/funcs/r/comment_column2.result 1595share/mysql/test/suite/engines/funcs/r/comment_column2.result
@@ -2941,26 +2924,28 @@ share/mysql/test/suite/innodb/r/innodb_b @@ -2941,26 +2924,28 @@ share/mysql/test/suite/innodb/r/innodb_b
2941share/mysql/test/suite/innodb/r/innodb_bug53591.result 2924share/mysql/test/suite/innodb/r/innodb_bug53591.result
2942share/mysql/test/suite/innodb/r/innodb_bug53592.result 2925share/mysql/test/suite/innodb/r/innodb_bug53592.result
2943share/mysql/test/suite/innodb/r/innodb_bug53674.result 2926share/mysql/test/suite/innodb/r/innodb_bug53674.result
2944share/mysql/test/suite/innodb/r/innodb_bug53756.result 2927share/mysql/test/suite/innodb/r/innodb_bug53756.result
2945share/mysql/test/suite/innodb/r/innodb_bug54044.result 2928share/mysql/test/suite/innodb/r/innodb_bug54044.result
2946share/mysql/test/suite/innodb/r/innodb_bug56143.result 2929share/mysql/test/suite/innodb/r/innodb_bug56143.result
2947share/mysql/test/suite/innodb/r/innodb_bug56680.result 2930share/mysql/test/suite/innodb/r/innodb_bug56680.result
2948share/mysql/test/suite/innodb/r/innodb_bug56716.result 2931share/mysql/test/suite/innodb/r/innodb_bug56716.result
2949share/mysql/test/suite/innodb/r/innodb_bug56947.result 2932share/mysql/test/suite/innodb/r/innodb_bug56947.result
2950share/mysql/test/suite/innodb/r/innodb_bug57252.result 2933share/mysql/test/suite/innodb/r/innodb_bug57252.result
2951share/mysql/test/suite/innodb/r/innodb_bug57255.result 2934share/mysql/test/suite/innodb/r/innodb_bug57255.result
2952share/mysql/test/suite/innodb/r/innodb_bug57904.result 2935share/mysql/test/suite/innodb/r/innodb_bug57904.result
2953share/mysql/test/suite/innodb/r/innodb_bug59307.result 2936share/mysql/test/suite/innodb/r/innodb_bug59307.result
 2937share/mysql/test/suite/innodb/r/innodb_bug59410.result
 2938share/mysql/test/suite/innodb/r/innodb_bug59641.result
2954share/mysql/test/suite/innodb/r/innodb_bug60049.result 2939share/mysql/test/suite/innodb/r/innodb_bug60049.result
2955share/mysql/test/suite/innodb/r/innodb_bug60196.result 2940share/mysql/test/suite/innodb/r/innodb_bug60196.result
2956share/mysql/test/suite/innodb/r/innodb_file_format.result 2941share/mysql/test/suite/innodb/r/innodb_file_format.result
2957share/mysql/test/suite/innodb/r/innodb_gis.result 2942share/mysql/test/suite/innodb/r/innodb_gis.result
2958share/mysql/test/suite/innodb/r/innodb_information_schema.result 2943share/mysql/test/suite/innodb/r/innodb_information_schema.result
2959share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result 2944share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
2960share/mysql/test/suite/innodb/r/innodb_multi_update.result 2945share/mysql/test/suite/innodb/r/innodb_multi_update.result
2961share/mysql/test/suite/innodb/r/innodb_mysql.result 2946share/mysql/test/suite/innodb/r/innodb_mysql.result
2962share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result 2947share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
2963share/mysql/test/suite/innodb/r/innodb_notembedded.result 2948share/mysql/test/suite/innodb/r/innodb_notembedded.result
2964share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result 2949share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
2965share/mysql/test/suite/innodb/r/innodb_trx_weight.result 2950share/mysql/test/suite/innodb/r/innodb_trx_weight.result
2966share/mysql/test/suite/innodb/t/disabled.def 2951share/mysql/test/suite/innodb/t/disabled.def
@@ -3035,26 +3020,28 @@ share/mysql/test/suite/innodb/t/innodb_b @@ -3035,26 +3020,28 @@ share/mysql/test/suite/innodb/t/innodb_b
3035share/mysql/test/suite/innodb/t/innodb_bug53674-master.opt 3020share/mysql/test/suite/innodb/t/innodb_bug53674-master.opt
3036share/mysql/test/suite/innodb/t/innodb_bug53674.test 3021share/mysql/test/suite/innodb/t/innodb_bug53674.test
3037share/mysql/test/suite/innodb/t/innodb_bug53756-master.opt 3022share/mysql/test/suite/innodb/t/innodb_bug53756-master.opt
3038share/mysql/test/suite/innodb/t/innodb_bug53756.test 3023share/mysql/test/suite/innodb/t/innodb_bug53756.test
3039share/mysql/test/suite/innodb/t/innodb_bug54044.test 3024share/mysql/test/suite/innodb/t/innodb_bug54044.test
3040share/mysql/test/suite/innodb/t/innodb_bug56143.test 3025share/mysql/test/suite/innodb/t/innodb_bug56143.test
3041share/mysql/test/suite/innodb/t/innodb_bug56680.test 3026share/mysql/test/suite/innodb/t/innodb_bug56680.test
3042share/mysql/test/suite/innodb/t/innodb_bug56716.test 3027share/mysql/test/suite/innodb/t/innodb_bug56716.test
3043share/mysql/test/suite/innodb/t/innodb_bug56947.test 3028share/mysql/test/suite/innodb/t/innodb_bug56947.test
3044share/mysql/test/suite/innodb/t/innodb_bug57252.test 3029share/mysql/test/suite/innodb/t/innodb_bug57252.test
3045share/mysql/test/suite/innodb/t/innodb_bug57255.test 3030share/mysql/test/suite/innodb/t/innodb_bug57255.test
3046share/mysql/test/suite/innodb/t/innodb_bug57904.test 3031share/mysql/test/suite/innodb/t/innodb_bug57904.test
3047share/mysql/test/suite/innodb/t/innodb_bug59307.test 3032share/mysql/test/suite/innodb/t/innodb_bug59307.test
 3033share/mysql/test/suite/innodb/t/innodb_bug59410.test
 3034share/mysql/test/suite/innodb/t/innodb_bug59641.test
3048share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt 3035share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt
3049share/mysql/test/suite/innodb/t/innodb_bug60049.test 3036share/mysql/test/suite/innodb/t/innodb_bug60049.test
3050share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt 3037share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt
3051share/mysql/test/suite/innodb/t/innodb_bug60196.test 3038share/mysql/test/suite/innodb/t/innodb_bug60196.test
3052share/mysql/test/suite/innodb/t/innodb_file_format.test 3039share/mysql/test/suite/innodb/t/innodb_file_format.test
3053share/mysql/test/suite/innodb/t/innodb_gis.test 3040share/mysql/test/suite/innodb/t/innodb_gis.test
3054share/mysql/test/suite/innodb/t/innodb_information_schema.test 3041share/mysql/test/suite/innodb/t/innodb_information_schema.test
3055share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt 3042share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
3056share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test 3043share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
3057share/mysql/test/suite/innodb/t/innodb_multi_update.test 3044share/mysql/test/suite/innodb/t/innodb_multi_update.test
3058share/mysql/test/suite/innodb/t/innodb_mysql-master.opt 3045share/mysql/test/suite/innodb/t/innodb_mysql-master.opt
3059share/mysql/test/suite/innodb/t/innodb_mysql.test 3046share/mysql/test/suite/innodb/t/innodb_mysql.test
3060share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt 3047share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt
@@ -3772,26 +3759,27 @@ share/mysql/test/suite/rpl/r/rpl_auto_in @@ -3772,26 +3759,27 @@ share/mysql/test/suite/rpl/r/rpl_auto_in
3772share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result 3759share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result
3773share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result 3760share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result
3774share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result 3761share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result
3775share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result 3762share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
3776share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result 3763share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
3777share/mysql/test/suite/rpl/r/rpl_binlog_errors.result 3764share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
3778share/mysql/test/suite/rpl/r/rpl_binlog_grant.result 3765share/mysql/test/suite/rpl/r/rpl_binlog_grant.result
3779share/mysql/test/suite/rpl/r/rpl_bit.result 3766share/mysql/test/suite/rpl/r/rpl_bit.result
3780share/mysql/test/suite/rpl/r/rpl_bit_npk.result 3767share/mysql/test/suite/rpl/r/rpl_bit_npk.result
3781share/mysql/test/suite/rpl/r/rpl_blackhole.result 3768share/mysql/test/suite/rpl/r/rpl_blackhole.result
3782share/mysql/test/suite/rpl/r/rpl_bug26395.result 3769share/mysql/test/suite/rpl/r/rpl_bug26395.result
3783share/mysql/test/suite/rpl/r/rpl_bug31076.result 3770share/mysql/test/suite/rpl/r/rpl_bug31076.result
3784share/mysql/test/suite/rpl/r/rpl_bug33931.result 3771share/mysql/test/suite/rpl/r/rpl_bug33931.result
 3772share/mysql/test/suite/rpl/r/rpl_bug37426.result
3785share/mysql/test/suite/rpl/r/rpl_bug38694.result 3773share/mysql/test/suite/rpl/r/rpl_bug38694.result
3786share/mysql/test/suite/rpl/r/rpl_bug41902.result 3774share/mysql/test/suite/rpl/r/rpl_bug41902.result
3787share/mysql/test/suite/rpl/r/rpl_change_master.result 3775share/mysql/test/suite/rpl/r/rpl_change_master.result
3788share/mysql/test/suite/rpl/r/rpl_charset.result 3776share/mysql/test/suite/rpl/r/rpl_charset.result
3789share/mysql/test/suite/rpl/r/rpl_charset_sjis.result 3777share/mysql/test/suite/rpl/r/rpl_charset_sjis.result
3790share/mysql/test/suite/rpl/r/rpl_circular_for_4_hosts.result 3778share/mysql/test/suite/rpl/r/rpl_circular_for_4_hosts.result
3791share/mysql/test/suite/rpl/r/rpl_colSize.result 3779share/mysql/test/suite/rpl/r/rpl_colSize.result
3792share/mysql/test/suite/rpl/r/rpl_commit_after_flush.result 3780share/mysql/test/suite/rpl/r/rpl_commit_after_flush.result
3793share/mysql/test/suite/rpl/r/rpl_concurrency_error.result 3781share/mysql/test/suite/rpl/r/rpl_concurrency_error.result
3794share/mysql/test/suite/rpl/r/rpl_conditional_comments.result 3782share/mysql/test/suite/rpl/r/rpl_conditional_comments.result
3795share/mysql/test/suite/rpl/r/rpl_create_database.result 3783share/mysql/test/suite/rpl/r/rpl_create_database.result
3796share/mysql/test/suite/rpl/r/rpl_create_if_not_exists.result 3784share/mysql/test/suite/rpl/r/rpl_create_if_not_exists.result
3797share/mysql/test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result 3785share/mysql/test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
@@ -4069,26 +4057,27 @@ share/mysql/test/suite/rpl/t/rpl_begin_c @@ -4069,26 +4057,27 @@ share/mysql/test/suite/rpl/t/rpl_begin_c
4069share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt 4057share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
4070share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback.test 4058share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback.test
4071share/mysql/test/suite/rpl/t/rpl_binlog_corruption.test 4059share/mysql/test/suite/rpl/t/rpl_binlog_corruption.test
4072share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt 4060share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt
4073share/mysql/test/suite/rpl/t/rpl_binlog_errors.test 4061share/mysql/test/suite/rpl/t/rpl_binlog_errors.test
4074share/mysql/test/suite/rpl/t/rpl_binlog_grant.test 4062share/mysql/test/suite/rpl/t/rpl_binlog_grant.test
4075share/mysql/test/suite/rpl/t/rpl_bit.test 4063share/mysql/test/suite/rpl/t/rpl_bit.test
4076share/mysql/test/suite/rpl/t/rpl_bit_npk.test 4064share/mysql/test/suite/rpl/t/rpl_bit_npk.test
4077share/mysql/test/suite/rpl/t/rpl_blackhole.test 4065share/mysql/test/suite/rpl/t/rpl_blackhole.test
4078share/mysql/test/suite/rpl/t/rpl_bug26395.test 4066share/mysql/test/suite/rpl/t/rpl_bug26395.test
4079share/mysql/test/suite/rpl/t/rpl_bug31076.test 4067share/mysql/test/suite/rpl/t/rpl_bug31076.test
4080share/mysql/test/suite/rpl/t/rpl_bug33931-master.opt 4068share/mysql/test/suite/rpl/t/rpl_bug33931-master.opt
4081share/mysql/test/suite/rpl/t/rpl_bug33931.test 4069share/mysql/test/suite/rpl/t/rpl_bug33931.test
 4070share/mysql/test/suite/rpl/t/rpl_bug37426.test
4082share/mysql/test/suite/rpl/t/rpl_bug38694-slave.opt 4071share/mysql/test/suite/rpl/t/rpl_bug38694-slave.opt
4083share/mysql/test/suite/rpl/t/rpl_bug38694.test 4072share/mysql/test/suite/rpl/t/rpl_bug38694.test
4084share/mysql/test/suite/rpl/t/rpl_bug41902-slave.opt 4073share/mysql/test/suite/rpl/t/rpl_bug41902-slave.opt
4085share/mysql/test/suite/rpl/t/rpl_bug41902.test 4074share/mysql/test/suite/rpl/t/rpl_bug41902.test
4086share/mysql/test/suite/rpl/t/rpl_change_master.test 4075share/mysql/test/suite/rpl/t/rpl_change_master.test
4087share/mysql/test/suite/rpl/t/rpl_charset.test 4076share/mysql/test/suite/rpl/t/rpl_charset.test
4088share/mysql/test/suite/rpl/t/rpl_charset_sjis.test 4077share/mysql/test/suite/rpl/t/rpl_charset_sjis.test
4089share/mysql/test/suite/rpl/t/rpl_circular_for_4_hosts.cnf 4078share/mysql/test/suite/rpl/t/rpl_circular_for_4_hosts.cnf
4090share/mysql/test/suite/rpl/t/rpl_circular_for_4_hosts.test 4079share/mysql/test/suite/rpl/t/rpl_circular_for_4_hosts.test
4091share/mysql/test/suite/rpl/t/rpl_colSize.test 4080share/mysql/test/suite/rpl/t/rpl_colSize.test
4092share/mysql/test/suite/rpl/t/rpl_commit_after_flush.test 4081share/mysql/test/suite/rpl/t/rpl_commit_after_flush.test
4093share/mysql/test/suite/rpl/t/rpl_concurrency_error-master.opt 4082share/mysql/test/suite/rpl/t/rpl_concurrency_error-master.opt
4094share/mysql/test/suite/rpl/t/rpl_concurrency_error.test 4083share/mysql/test/suite/rpl/t/rpl_concurrency_error.test