diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-08-12 11:17:45 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-02 13:22:28 +0300 |
| commit | 2e814d4702d71a04388386a9f591d14a35980bfe (patch) | |
| tree | f3f9b48d116a3738c5e71f3a360ca61f16cfb632 /storage/innobase/include/pars0opt.h | |
| parent | 848d211c5c4df00b819cd84d7530cf7d29bb0524 (diff) | |
| download | mariadb-git-2e814d4702d71a04388386a9f591d14a35980bfe.tar.gz | |
Merge InnoDB 5.7 from mysql-5.7.9.
Contains also
MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7
The failure happened because 5.7 has changed the signature of
the bool handler::primary_key_is_clustered() const
virtual function ("const" was added). InnoDB was using the old
signature which caused the function not to be used.
MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7
Fixed mutexing problem on lock_trx_handle_wait. Note that
rpl_parallel and rpl_optimistic_parallel tests still
fail.
MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
Reason: incorrect merge
MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
Reason: incorrect merge
Diffstat (limited to 'storage/innobase/include/pars0opt.h')
| -rw-r--r-- | storage/innobase/include/pars0opt.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h index 1084d644c90..cb1ce60ac22 100644 --- a/storage/innobase/include/pars0opt.h +++ b/storage/innobase/include/pars0opt.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -37,7 +37,6 @@ Created 12/21/1997 Heikki Tuuri Optimizes a select. Decides which indexes to tables to use. The tables are accessed in the order that they were written to the FROM part in the select statement. */ -UNIV_INTERN void opt_search_plan( /*============*/ @@ -49,7 +48,6 @@ already exist in the list. If the column is already in the list, puts a value indirection to point to the occurrence in the column list, except if the column occurrence we are looking at is in the column list, in which case nothing is done. */ -UNIV_INTERN void opt_find_all_cols( /*==============*/ @@ -60,13 +58,14 @@ opt_find_all_cols( to add new found columns */ plan_t* plan, /*!< in: plan or NULL */ que_node_t* exp); /*!< in: expression or condition */ +#ifdef UNIV_SQL_DEBUG /********************************************************************//** Prints info of a query plan. */ -UNIV_INTERN void opt_print_query_plan( /*=================*/ sel_node_t* sel_node); /*!< in: select node */ +#endif /* UNIV_SQL_DEBUG */ #ifndef UNIV_NONINL #include "pars0opt.ic" |