Tue Oct 1 10:26:39 2013 UTC ()
Changes 5.6.14:
* MySQL 5.7 changed audit log file output to a new format that has better compatibility with Oracle Audit Vault. This format has been backported to MySQL 5.6 and it is possible to select either the old or new format using the new audit_log_format system variable, which has permitted values of OLD and NEW (default OLD). For details about each format, see The Audit Log File.
* Important Change; Replication: START SLAVE UNTIL SQL_AFTER_GTIDS did not cause the slave to stop until the next GTID event was received following execution of the transaction having the indicated GTID, which could cause issues in the case when the next GTID event is delayed, or does not exist. Now the slave stops after completing the transaction with that GTID.
* InnoDB; Partitioning: Following any query on the INFORMATION_SCHEMA.PARTITIONS table, InnoDB index statistics as shown in the output of statements such as SELECT * FROM INFORMATION_SCHEMA.STATISTICS were read from the last partition, instead of from the partition containing the greatest number of rows.
* InnoDB: When logging the delete-marking of a record during online ALTER TABLE...ADD PRIMARY KEY, InnoDB writes the transaction ID to the log as it was before the deletion or delete-marking of the record. When doing this, InnoDB would overwrite the DB_TRX_ID field in the original table, which could result in locking issues.
* InnoDB: The row_sel_sec_rec_is_for_clust_rec function would incorrectly prepare to compare a NULL column prefix in a secondary index with a non-NULL column in a clustered index.
* InnoDB: An incorrect purge would occur when rolling back an update to a delete-marked record.
* InnoDB: An assertion would be raised in fil_node_open_file due to a missing .ibd file. Instead of asserting, InnoDB should return false and the caller of fil_node_open_file should handle the return message.
* InnoDB: The assertion ut_ad(oldest_lsn <= cur_lsn) in file buf0flu.cc would fail because the current max LSN would be retrieved from the buffer pool before the oldest LSN.
* InnoDB: InnoDB memcached add and set operations would perform more slowly than SQL INSERT operations.
* InnoDB: The InnoDB memcached plugin could be initialized to insert into an InnoDB table with an INTEGER primary key.
More...


(adam)
diff -r1.7 -r1.8 pkgsrc/databases/mysql56-client/Makefile
diff -r1.9 -r1.10 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.9 -r1.10 pkgsrc/databases/mysql56-client/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/mysql56-client/patches/patch-sql_transaction.cc
diff -r1.4 -r1.5 pkgsrc/databases/mysql56-server/PLIST
cvs diff -r1.7 -r1.8 pkgsrc/databases/mysql56-client/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile 2013/08/31 02:09:25 1.7
+++ pkgsrc/databases/mysql56-client/Makefile 2013/10/01 10:26:39 1.8
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.7 2013/08/31 02:09:25 taca Exp $ 1# $NetBSD: Makefile,v 1.8 2013/10/01 10:26:39 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 
5SVR4_PKGNAME= mysqc 4SVR4_PKGNAME= mysqc
6COMMENT= MySQL 5, a free SQL database (client) 5COMMENT= MySQL 5, a free SQL database (client)
7 6
8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
9 8
10.include "Makefile.common" 9.include "Makefile.common"
11 10
12CMAKE_ARGS+= -DWITHOUT_SERVER=ON 11CMAKE_ARGS+= -DWITHOUT_SERVER=ON
13UNWRAP_FILES+= scripts/mysql_config 12UNWRAP_FILES+= scripts/mysql_config
14INFO_FILES= yes 13INFO_FILES= yes
15INSTALL_DIRS+= client include libmysql man scripts tests 14INSTALL_DIRS+= client include libmysql man scripts tests
16 15
17REPLACE_PERL= scripts/mysql_convert_table_format.sh 16REPLACE_PERL= scripts/mysql_convert_table_format.sh
cvs diff -r1.9 -r1.10 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2013/07/31 09:51:38 1.9
+++ pkgsrc/databases/mysql56-client/Makefile.common 2013/10/01 10:26:39 1.10
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.9 2013/07/31 09:51:38 adam Exp $ 1# $NetBSD: Makefile.common,v 1.10 2013/10/01 10:26:39 adam Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.13 6DISTNAME= mysql-5.6.14
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
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
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
cvs diff -r1.9 -r1.10 pkgsrc/databases/mysql56-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2013/07/31 09:51:38 1.9
+++ pkgsrc/databases/mysql56-client/distinfo 2013/10/01 10:26:39 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.9 2013/07/31 09:51:38 adam Exp $ 1$NetBSD: distinfo,v 1.10 2013/10/01 10:26:39 adam Exp $
2 2
3SHA1 (mysql-5.6.13.tar.gz) = 06e1d856cfb1f98844ef92af47d4f4f7036ef294 3SHA1 (mysql-5.6.14.tar.gz) = 7cf44fb2a7733b52559f66c00446122bc79321d2
4RMD160 (mysql-5.6.13.tar.gz) = 22411eda9da0d931a44ab0710ded76c065cd05e6 4RMD160 (mysql-5.6.14.tar.gz) = e1827858c60d674ac1ddeb4f71e689d49855eec9
5Size (mysql-5.6.13.tar.gz) = 35951160 bytes 5Size (mysql-5.6.14.tar.gz) = 36005278 bytes
6SHA1 (patch-CMakeLists.txt) = 1889afcd79a271d3f9ac0e234c449ef6aa8ca818 6SHA1 (patch-CMakeLists.txt) = 1889afcd79a271d3f9ac0e234c449ef6aa8ca818
7SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 7SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
8SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 8SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
9SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52 9SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
10SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 10SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
11SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc 11SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc
12SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 12SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
13SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 13SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
14SHA1 (patch-include_my__global.h) = d4574aea74221fe3626f3a0c0f5cee9a4d2f36dc 14SHA1 (patch-include_my__global.h) = d4574aea74221fe3626f3a0c0f5cee9a4d2f36dc
15SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 15SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
16SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd 16SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
17SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca 17SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
18SHA1 (patch-include_myisam.h) = c554a594ea0169cb725cfdfe5accaf231eebdc23 18SHA1 (patch-include_myisam.h) = c554a594ea0169cb725cfdfe5accaf231eebdc23
@@ -83,27 +83,27 @@ SHA1 (patch-sql_sql__planner.cc) = f3540 @@ -83,27 +83,27 @@ SHA1 (patch-sql_sql__planner.cc) = f3540
83SHA1 (patch-sql_sql__prepare.cc) = 886ee8ca5863704ddf172eb746c092f308e6ca1c 83SHA1 (patch-sql_sql__prepare.cc) = 886ee8ca5863704ddf172eb746c092f308e6ca1c
84SHA1 (patch-sql_sql__prepare.h) = 30b520b1dea2b8d8225c528ba58b9231d94a85dd 84SHA1 (patch-sql_sql__prepare.h) = 30b520b1dea2b8d8225c528ba58b9231d94a85dd
85SHA1 (patch-sql_sql__select.cc) = 30f2df455e1018088efdf896432f4fe35fb9b2f9 85SHA1 (patch-sql_sql__select.cc) = 30f2df455e1018088efdf896432f4fe35fb9b2f9
86SHA1 (patch-sql_sql__select.h) = 324ebb62c71d72e7a948921cfdec9f3401771100 86SHA1 (patch-sql_sql__select.h) = 324ebb62c71d72e7a948921cfdec9f3401771100
87SHA1 (patch-sql_sql__show.cc) = e606a267e86b9c63a46db972739561325fef7ee4 87SHA1 (patch-sql_sql__show.cc) = e606a267e86b9c63a46db972739561325fef7ee4
88SHA1 (patch-sql_sql__table.cc) = 6f87b68bca9b0a50c50c2392ea342005d53fd5cd 88SHA1 (patch-sql_sql__table.cc) = 6f87b68bca9b0a50c50c2392ea342005d53fd5cd
89SHA1 (patch-sql_sql__time.cc) = 7a27d9656020676cb8a211befcceb3e3b25670fb 89SHA1 (patch-sql_sql__time.cc) = 7a27d9656020676cb8a211befcceb3e3b25670fb
90SHA1 (patch-sql_sql__tmp__table.cc) = 5fa1a1b0bb7e245e1f618e7b7536bdf5f69b9528 90SHA1 (patch-sql_sql__tmp__table.cc) = 5fa1a1b0bb7e245e1f618e7b7536bdf5f69b9528
91SHA1 (patch-sql_sql__union.cc) = 0e0dd504eb91512d9ea668d7b09b09d25b3b3c2e 91SHA1 (patch-sql_sql__union.cc) = 0e0dd504eb91512d9ea668d7b09b09d25b3b3c2e
92SHA1 (patch-sql_sql__update.cc) = 9a56187727fd1538b059e2d87ca0ec15ebf3e0ff 92SHA1 (patch-sql_sql__update.cc) = 9a56187727fd1538b059e2d87ca0ec15ebf3e0ff
93SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf 93SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf
94SHA1 (patch-sql_sys__vars.cc) = f122050ef87e673763db4fa64202139834400d2c 94SHA1 (patch-sql_sys__vars.cc) = f122050ef87e673763db4fa64202139834400d2c
95SHA1 (patch-sql_table.cc) = ec9bb0891319918c306b0349fe43647e979bec4c 95SHA1 (patch-sql_table.cc) = ec9bb0891319918c306b0349fe43647e979bec4c
96SHA1 (patch-sql_transaction.cc) = 76316a7f0e7a81f47d194a0a1693b07873922969 96SHA1 (patch-sql_transaction.cc) = 34823a32f42472cf46df10e04294cd907170b41e
97SHA1 (patch-sql_tztime.cc) = b17a31afe95cc220b57906d263c5783793c169f4 97SHA1 (patch-sql_tztime.cc) = b17a31afe95cc220b57906d263c5783793c169f4
98SHA1 (patch-sql_unireg.cc) = 0d94b247c36838abe5cb683782dd16c05b322f32 98SHA1 (patch-sql_unireg.cc) = 0d94b247c36838abe5cb683782dd16c05b322f32
99SHA1 (patch-storage_federated_ha__federated.cc) = 17e575d4382a6d4c9005be77e7b4254380226e7c 99SHA1 (patch-storage_federated_ha__federated.cc) = 17e575d4382a6d4c9005be77e7b4254380226e7c
100SHA1 (patch-storage_heap_ha__heap.cc) = 8c3e426b34f5bbf2b527e539a91abfb806e14aa5 100SHA1 (patch-storage_heap_ha__heap.cc) = 8c3e426b34f5bbf2b527e539a91abfb806e14aa5
101SHA1 (patch-storage_heap_hp__hash.c) = a3bd242d72e398fcc6fe6450cf05066c1ddae664 101SHA1 (patch-storage_heap_hp__hash.c) = a3bd242d72e398fcc6fe6450cf05066c1ddae664
102SHA1 (patch-storage_myisam_ft__boolean__search.c) = dbace659ea15b5abe14008c1d798414cda708395 102SHA1 (patch-storage_myisam_ft__boolean__search.c) = dbace659ea15b5abe14008c1d798414cda708395
103SHA1 (patch-storage_myisam_ha__myisam.cc) = 758d5a161a2ef5daf864fa67a0d678d87b8be0aa 103SHA1 (patch-storage_myisam_ha__myisam.cc) = 758d5a161a2ef5daf864fa67a0d678d87b8be0aa
104SHA1 (patch-storage_myisam_mi__check.c) = 9a3101680f72329158947d04ccce07ef0db821aa 104SHA1 (patch-storage_myisam_mi__check.c) = 9a3101680f72329158947d04ccce07ef0db821aa
105SHA1 (patch-storage_myisam_mi__create.c) = 3267429a40936f1e134f5d309b6c2391d00ce708 105SHA1 (patch-storage_myisam_mi__create.c) = 3267429a40936f1e134f5d309b6c2391d00ce708
106SHA1 (patch-storage_myisam_mi__delete.c) = ba1cab21c4cc5b8a98d16742b77d66559cbef374 106SHA1 (patch-storage_myisam_mi__delete.c) = ba1cab21c4cc5b8a98d16742b77d66559cbef374
107SHA1 (patch-storage_myisam_mi__dynrec.c) = d4c5d630d016238171805c8d35798293d8595289 107SHA1 (patch-storage_myisam_mi__dynrec.c) = d4c5d630d016238171805c8d35798293d8595289
108SHA1 (patch-storage_myisam_mi__extra.c) = 941125d92943b1b9a3ceccb3cb8cd84a91a0e958 108SHA1 (patch-storage_myisam_mi__extra.c) = 941125d92943b1b9a3ceccb3cb8cd84a91a0e958
109SHA1 (patch-storage_myisam_mi__locking.c) = 63fa46e024f3e78deb052a5cbc0205262848865b 109SHA1 (patch-storage_myisam_mi__locking.c) = 63fa46e024f3e78deb052a5cbc0205262848865b
cvs diff -r1.1 -r1.2 pkgsrc/databases/mysql56-client/patches/Attic/patch-sql_transaction.cc (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/patches/Attic/patch-sql_transaction.cc 2013/05/06 14:41:08 1.1
+++ pkgsrc/databases/mysql56-client/patches/Attic/patch-sql_transaction.cc 2013/10/01 10:26:39 1.2
@@ -1,106 +1,115 @@ @@ -1,106 +1,115 @@
1$NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $ 1$NetBSD: patch-sql_transaction.cc,v 1.2 2013/10/01 10:26:39 adam Exp $
2 2
3--- sql/transaction.cc.orig 2013-05-05 20:56:04.000000000 +0000 3--- sql/transaction.cc.orig 2013-05-05 20:56:04.000000000 +0000
4+++ sql/transaction.cc 4+++ sql/transaction.cc
5@@ -134,7 +134,7 @@ bool trans_begin(THD *thd, uint flags) 5@@ -143,7 +143,7 @@ bool trans_begin(THD *thd, uint flags)
6 thd->server_status&= 6 thd->server_status&=
7 ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); 7 ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
8 DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); 8 DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS"));
9- res= test(ha_commit_trans(thd, TRUE)); 9- res= test(ha_commit_trans(thd, TRUE));
10+ res= my_test(ha_commit_trans(thd, TRUE)); 10+ res= my_test(ha_commit_trans(thd, TRUE));
11 } 11 }
12  12
13 thd->variables.option_bits&= ~OPTION_BEGIN; 13 thd->variables.option_bits&= ~OPTION_BEGIN;
14@@ -163,7 +163,7 @@ bool trans_begin(THD *thd, uint flags) 14@@ -172,7 +172,7 @@ bool trans_begin(THD *thd, uint flags)
15 compatibility. 15 compatibility.
16 */ 16 */
17 const bool user_is_super= 17 const bool user_is_super=
18- test(thd->security_ctx->master_access & SUPER_ACL); 18- test(thd->security_ctx->master_access & SUPER_ACL);
19+ my_test(thd->security_ctx->master_access & SUPER_ACL); 19+ my_test(thd->security_ctx->master_access & SUPER_ACL);
20 if (opt_readonly && !user_is_super) 20 if (opt_readonly && !user_is_super)
21 { 21 {
22 my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only"); 22 my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
23@@ -182,7 +182,7 @@ bool trans_begin(THD *thd, uint flags) 23@@ -191,7 +191,7 @@ bool trans_begin(THD *thd, uint flags)
24 if (flags & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT) 24 if (flags & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT)
25 res= ha_start_consistent_snapshot(thd); 25 res= ha_start_consistent_snapshot(thd);
26  26
27- DBUG_RETURN(test(res)); 27- DBUG_RETURN(test(res));
28+ DBUG_RETURN(my_test(res)); 28+ DBUG_RETURN(my_test(res));
29 } 29 }
30  30
31  31
32@@ -221,7 +221,7 @@ bool trans_commit(THD *thd) 32@@ -230,7 +230,7 @@ bool trans_commit(THD *thd)
33 thd->transaction.all.reset_unsafe_rollback_flags(); 33 thd->transaction.all.reset_unsafe_rollback_flags();
34 thd->lex->start_transaction_opt= 0; 34 thd->lex->start_transaction_opt= 0;
35  35
36- DBUG_RETURN(test(res)); 36- DBUG_RETURN(test(res));
37+ DBUG_RETURN(my_test(res)); 37+ DBUG_RETURN(my_test(res));
38 } 38 }
39  39
40  40
41@@ -263,7 +263,7 @@ bool trans_commit_implicit(THD *thd) 41@@ -278,7 +278,7 @@ bool trans_commit_implicit(THD *thd)
42 thd->server_status&= 42 thd->server_status&=
43 ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); 43 ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
44 DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); 44 DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS"));
45- res= test(ha_commit_trans(thd, TRUE)); 45- res= test(ha_commit_trans(thd, TRUE));
46+ res= my_test(ha_commit_trans(thd, TRUE)); 46+ res= my_test(ha_commit_trans(thd, TRUE));
47 } 47 }
48 else if (tc_log) 48 else if (tc_log)
49 tc_log->commit(thd, true); 49 tc_log->commit(thd, true);
50@@ -319,7 +319,7 @@ bool trans_rollback(THD *thd) 50@@ -334,7 +334,7 @@ bool trans_rollback(THD *thd)
51 thd->transaction.all.reset_unsafe_rollback_flags(); 51 thd->transaction.all.reset_unsafe_rollback_flags();
52 thd->lex->start_transaction_opt= 0; 52 thd->lex->start_transaction_opt= 0;
53  53
54- DBUG_RETURN(test(res)); 54- DBUG_RETURN(test(res));
55+ DBUG_RETURN(my_test(res)); 55+ DBUG_RETURN(my_test(res));
56 } 56 }
57  57
58  58
59@@ -382,7 +382,7 @@ bool trans_commit_stmt(THD *thd) 59@@ -380,7 +380,7 @@ bool trans_rollback_implicit(THD *thd)
 60 /* Rollback should clear transaction_rollback_request flag. */
 61 DBUG_ASSERT(! thd->transaction_rollback_request);
 62
 63- DBUG_RETURN(test(res));
 64+ DBUG_RETURN(my_test(res));
 65 }
 66
 67
 68@@ -443,7 +443,7 @@ bool trans_commit_stmt(THD *thd)
60  69
61 thd->transaction.stmt.reset(); 70 thd->transaction.stmt.reset();
62  71
63- DBUG_RETURN(test(res)); 72- DBUG_RETURN(test(res));
64+ DBUG_RETURN(my_test(res)); 73+ DBUG_RETURN(my_test(res));
65 } 74 }
66  75
67  76
68@@ -588,7 +588,7 @@ bool trans_rollback_to_savepoint(THD *th 77@@ -647,7 +647,7 @@ bool trans_rollback_to_savepoint(THD *th
69 if (!res && !binlog_on) 78 if (!res && !binlog_on)
70 thd->mdl_context.rollback_to_savepoint(sv->mdl_savepoint); 79 thd->mdl_context.rollback_to_savepoint(sv->mdl_savepoint);
71  80
72- DBUG_RETURN(test(res)); 81- DBUG_RETURN(test(res));
73+ DBUG_RETURN(my_test(res)); 82+ DBUG_RETURN(my_test(res));
74 } 83 }
75  84
76  85
77@@ -630,7 +630,7 @@ bool trans_release_savepoint(THD *thd, L 86@@ -689,7 +689,7 @@ bool trans_release_savepoint(THD *thd, L
78  87
79 thd->transaction.savepoints= sv->prev; 88 thd->transaction.savepoints= sv->prev;
80  89
81- DBUG_RETURN(test(res)); 90- DBUG_RETURN(test(res));
82+ DBUG_RETURN(my_test(res)); 91+ DBUG_RETURN(my_test(res));
83 } 92 }
84  93
85  94
86@@ -794,7 +794,7 @@ bool trans_xa_commit(THD *thd) 95@@ -853,7 +853,7 @@ bool trans_xa_commit(THD *thd)
87 else if (xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE) 96 else if (xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE)
88 { 97 {
89 int r= ha_commit_trans(thd, TRUE); 98 int r= ha_commit_trans(thd, TRUE);
90- if ((res= test(r))) 99- if ((res= test(r)))
91+ if ((res= my_test(r))) 100+ if ((res= my_test(r)))
92 my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0)); 101 my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0));
93 } 102 }
94 else if (xa_state == XA_PREPARED && thd->lex->xa_opt == XA_NONE) 103 else if (xa_state == XA_PREPARED && thd->lex->xa_opt == XA_NONE)
95@@ -822,9 +822,9 @@ bool trans_xa_commit(THD *thd) 104@@ -881,9 +881,9 @@ bool trans_xa_commit(THD *thd)
96 DEBUG_SYNC(thd, "trans_xa_commit_after_acquire_commit_lock"); 105 DEBUG_SYNC(thd, "trans_xa_commit_after_acquire_commit_lock");
97  106
98 if (tc_log) 107 if (tc_log)
99- res= test(tc_log->commit(thd, /* all */ true)); 108- res= test(tc_log->commit(thd, /* all */ true));
100+ res= my_test(tc_log->commit(thd, /* all */ true)); 109+ res= my_test(tc_log->commit(thd, /* all */ true));
101 else 110 else
102- res= test(ha_commit_low(thd, /* all */ true)); 111- res= test(ha_commit_low(thd, /* all */ true));
103+ res= my_test(ha_commit_low(thd, /* all */ true)); 112+ res= my_test(ha_commit_low(thd, /* all */ true));
104  113
105 if (res) 114 if (res)
106 my_error(ER_XAER_RMERR, MYF(0)); 115 my_error(ER_XAER_RMERR, MYF(0));
cvs diff -r1.4 -r1.5 pkgsrc/databases/mysql56-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/PLIST 2013/07/31 09:51:38 1.4
+++ pkgsrc/databases/mysql56-server/PLIST 2013/10/01 10:26:39 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2013/07/31 09:51:38 adam Exp $ 1@comment $NetBSD: PLIST,v 1.5 2013/10/01 10:26:39 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
9${PLIST.embedded}bin/mysql_embedded 9${PLIST.embedded}bin/mysql_embedded
10bin/mysql_tzinfo_to_sql 10bin/mysql_tzinfo_to_sql
11bin/mysql_waitpid 11bin/mysql_waitpid
12${PLIST.embedded}bin/mysqltest_embedded 12${PLIST.embedded}bin/mysqltest_embedded
13bin/perror 13bin/perror
14bin/replace 14bin/replace
@@ -491,26 +491,27 @@ share/mysql/test/include/have_simple_par @@ -491,26 +491,27 @@ share/mysql/test/include/have_simple_par
491share/mysql/test/include/have_sjis.inc 491share/mysql/test/include/have_sjis.inc
492share/mysql/test/include/have_ssl.inc 492share/mysql/test/include/have_ssl.inc
493share/mysql/test/include/have_ssl_communication.inc 493share/mysql/test/include/have_ssl_communication.inc
494share/mysql/test/include/have_ssl_crypto_functs.inc 494share/mysql/test/include/have_ssl_crypto_functs.inc
495share/mysql/test/include/have_symlink.inc 495share/mysql/test/include/have_symlink.inc
496share/mysql/test/include/have_tis620.inc 496share/mysql/test/include/have_tis620.inc
497share/mysql/test/include/have_ucs2.inc 497share/mysql/test/include/have_ucs2.inc
498share/mysql/test/include/have_udf.inc 498share/mysql/test/include/have_udf.inc
499share/mysql/test/include/have_ujis.inc 499share/mysql/test/include/have_ujis.inc
500share/mysql/test/include/have_utf16.inc 500share/mysql/test/include/have_utf16.inc
501share/mysql/test/include/have_utf32.inc 501share/mysql/test/include/have_utf32.inc
502share/mysql/test/include/have_utf8.inc 502share/mysql/test/include/have_utf8.inc
503share/mysql/test/include/have_utf8mb4.inc 503share/mysql/test/include/have_utf8mb4.inc
 504share/mysql/test/include/have_valgrind.inc
504share/mysql/test/include/have_validate_password_plugin.inc 505share/mysql/test/include/have_validate_password_plugin.inc
505share/mysql/test/include/ib_logfile_size_check.inc 506share/mysql/test/include/ib_logfile_size_check.inc
506share/mysql/test/include/icp_tests.inc 507share/mysql/test/include/icp_tests.inc
507share/mysql/test/include/implicit_commit_helper.inc 508share/mysql/test/include/implicit_commit_helper.inc
508share/mysql/test/include/index_merge1.inc 509share/mysql/test/include/index_merge1.inc
509share/mysql/test/include/index_merge2.inc 510share/mysql/test/include/index_merge2.inc
510share/mysql/test/include/index_merge_2sweeps.inc 511share/mysql/test/include/index_merge_2sweeps.inc
511share/mysql/test/include/index_merge_delete.inc 512share/mysql/test/include/index_merge_delete.inc
512share/mysql/test/include/index_merge_insert-and-replace.inc 513share/mysql/test/include/index_merge_insert-and-replace.inc
513share/mysql/test/include/index_merge_intersect_dml.inc 514share/mysql/test/include/index_merge_intersect_dml.inc
514share/mysql/test/include/index_merge_multi_col_setup.inc 515share/mysql/test/include/index_merge_multi_col_setup.inc
515share/mysql/test/include/index_merge_ror.inc 516share/mysql/test/include/index_merge_ror.inc
516share/mysql/test/include/index_merge_ror_cpk.inc 517share/mysql/test/include/index_merge_ror_cpk.inc