mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge InnoDB 5.7 from mysql-5.7.9.

Browse source 
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
This commit is contained in:
Jan Lindström 2016-08-12 11:17:45 +03:00
commit 2e814d4702
835 changed files with 173885 additions and 83591 deletions
Download patch file Download diff file Expand all files Collapse all files

23
storage/innobase/include/ut0list.h
View file

@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 2006, 2009, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2006, 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
@ -54,8 +54,7 @@ struct ib_list_node_t;
/****************************************************************//**
Create a new list using mem_alloc. Lists created with this function must be
freed with ib_list_free.
@return list */
UNIV_INTERN
@return list */
ib_list_t*
ib_list_create(void);
/*=================*/
@ -64,8 +63,7 @@ ib_list_create(void);
/****************************************************************//**
Create a new list using the given heap. ib_list_free MUST NOT BE CALLED for
lists created with this function.
@return list */
UNIV_INTERN
@return list */
ib_list_t*
ib_list_create_heap(
/*================*/
@ -73,7 +71,6 @@ ib_list_create_heap(
/****************************************************************//**
Free a list. */
UNIV_INTERN
void
ib_list_free(
/*=========*/
@ -81,8 +78,7 @@ ib_list_free(
/****************************************************************//**
Add the data to the start of the list.
@return new list node */
UNIV_INTERN
@return new list node */
ib_list_node_t*
ib_list_add_first(
/*==============*/
@ -92,8 +88,7 @@ ib_list_add_first(
/****************************************************************//**
Add the data to the end of the list.
@return new list node */
UNIV_INTERN
@return new list node */
ib_list_node_t*
ib_list_add_last(
/*=============*/
@ -103,8 +98,7 @@ ib_list_add_last(
/****************************************************************//**
Add the data after the indicated node.
@return new list node */
UNIV_INTERN
@return new list node */
ib_list_node_t*
ib_list_add_after(
/*==============*/
@ -116,7 +110,6 @@ ib_list_add_after(
/****************************************************************//**
Remove the node from the list. */
UNIV_INTERN
void
ib_list_remove(
/*===========*/
@ -125,7 +118,7 @@ ib_list_remove(
/****************************************************************//**
Get the first node in the list.
@return first node, or NULL */
@return first node, or NULL */
UNIV_INLINE
ib_list_node_t*
ib_list_get_first(
@ -134,7 +127,7 @@ ib_list_get_first(
/****************************************************************//**
Get the last node in the list.
@return last node, or NULL */
@return last node, or NULL */
UNIV_INLINE
ib_list_node_t*
ib_list_get_last(