summaryrefslogtreecommitdiff
path: root/databases/mysql56-client/patches/patch-sql_sql__cache.cc
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2013-12-03 20:02:41 +0000
committeradam <adam@pkgsrc.org>2013-12-03 20:02:41 +0000
commit6599fc6fc2199721431c620d84139199bb925204 (patch)
tree5e53311469c623d40e2876718ae8a4e84508a88e /databases/mysql56-client/patches/patch-sql_sql__cache.cc
parent8e6882929a60717b99c1ddaa73a2202b8d5a8206 (diff)
downloadpkgsrc-6599fc6fc2199721431c620d84139199bb925204.tar.gz
Changes 5.6.15:
* Previously, MySQL Server distributions included the MySQL Reference Manual in Info format (the Docs/mysql.info file). Because the license for the manual restricts redistribution, its inclusion in Community packages caused problems for downstream redistributors, such as those who create Linux distributions. Community distributions of MySQL Server no longer include the mysql.info file, to make the repackaging and redistribution process easier (for example, the source tarball and its checksum can be used directly). This change applies to all source and binary Community packaging formats. Commercial (Enterprise) distributions are unchanged. * Incompatible Change: Several statement instruments in the setup_instruments table are used by the Performance Schema during the early stages of statement classification before the exact statement type is known. * The Performance Schema now instruments the read/write lock Delegate::lock * A new CMake option, WITH_ASAN, permits enabling address sanitization for compilers that support it. * The hash function used for metadata locking was modified to reduce overhead. * Bugs Fixed
Diffstat (limited to 'databases/mysql56-client/patches/patch-sql_sql__cache.cc')
-rw-r--r--databases/mysql56-client/patches/patch-sql_sql__cache.cc56
1 files changed, 0 insertions, 56 deletions
diff --git a/databases/mysql56-client/patches/patch-sql_sql__cache.cc b/databases/mysql56-client/patches/patch-sql_sql__cache.cc
deleted file mode 100644
index ccc257d7398..00000000000
--- a/databases/mysql56-client/patches/patch-sql_sql__cache.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-sql_sql__cache.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
-
---- sql/sql_cache.cc.orig 2013-05-05 20:56:04.000000000 +0000
-+++ sql/sql_cache.cc
-@@ -1209,8 +1209,8 @@ void Query_cache::store_query(THD *thd,
- Query_cache_query_flags flags;
- // fill all gaps between fields with 0 to get repeatable key
- memset(&flags, 0, QUERY_CACHE_FLAGS_SIZE);
-- flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG);
-- flags.client_protocol_41= test(thd->client_capabilities &
-+ flags.client_long_flag= my_test(thd->client_capabilities & CLIENT_LONG_FLAG);
-+ flags.client_protocol_41= my_test(thd->client_capabilities &
- CLIENT_PROTOCOL_41);
- /*
- Protocol influences result format, so statement results in the binary
-@@ -1220,10 +1220,10 @@ void Query_cache::store_query(THD *thd,
- flags.protocol_type= (unsigned int) thd->protocol->type();
- /* PROTOCOL_LOCAL results are not cached. */
- DBUG_ASSERT(flags.protocol_type != (unsigned int) Protocol::PROTOCOL_LOCAL);
-- flags.more_results_exists= test(thd->server_status &
-+ flags.more_results_exists= my_test(thd->server_status &
- SERVER_MORE_RESULTS_EXISTS);
- flags.in_trans= thd->in_active_multi_stmt_transaction();
-- flags.autocommit= test(thd->server_status & SERVER_STATUS_AUTOCOMMIT);
-+ flags.autocommit= my_test(thd->server_status & SERVER_STATUS_AUTOCOMMIT);
- flags.pkt_nr= net->pkt_nr;
- flags.character_set_client_num=
- thd->variables.character_set_client->number;
-@@ -1584,14 +1584,14 @@ Query_cache::send_result_to_client(THD *
-
- // fill all gaps between fields with 0 to get repeatable key
- memset(&flags, 0, QUERY_CACHE_FLAGS_SIZE);
-- flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG);
-- flags.client_protocol_41= test(thd->client_capabilities &
-+ flags.client_long_flag= my_test(thd->client_capabilities & CLIENT_LONG_FLAG);
-+ flags.client_protocol_41= my_test(thd->client_capabilities &
- CLIENT_PROTOCOL_41);
- flags.protocol_type= (unsigned int) thd->protocol->type();
-- flags.more_results_exists= test(thd->server_status &
-+ flags.more_results_exists= my_test(thd->server_status &
- SERVER_MORE_RESULTS_EXISTS);
- flags.in_trans= thd->in_active_multi_stmt_transaction();
-- flags.autocommit= test(thd->server_status & SERVER_STATUS_AUTOCOMMIT);
-+ flags.autocommit= my_test(thd->server_status & SERVER_STATUS_AUTOCOMMIT);
- flags.pkt_nr= thd->net.pkt_nr;
- flags.character_set_client_num= thd->variables.character_set_client->number;
- flags.character_set_results_num=
-@@ -3040,7 +3040,7 @@ my_bool Query_cache::register_all_tables
- tmp++)
- unlink_table(tmp);
- }
-- return test(n);
-+ return my_test(n);
- }
-
-