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

10
storage/innobase/include/dict0boot.ic
View file

@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1996, 2013, 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
@ -25,7 +25,7 @@ Created 4/18/1996 Heikki Tuuri
/**********************************************************************//**
Returns a new row id.
@return the new id */
@return the new id */
UNIV_INLINE
row_id_t
dict_sys_get_new_row_id(void)
@ -33,7 +33,7 @@ dict_sys_get_new_row_id(void)
{
row_id_t id;
mutex_enter(&(dict_sys->mutex));
mutex_enter(&dict_sys->mutex);
id = dict_sys->row_id;
@ -44,14 +44,14 @@ dict_sys_get_new_row_id(void)
dict_sys->row_id++;
mutex_exit(&(dict_sys->mutex));
mutex_exit(&dict_sys->mutex);
return(id);
}
/**********************************************************************//**
Reads a row id from a record or other 6-byte stored form.
@return row id */
@return row id */
UNIV_INLINE
row_id_t
dict_sys_read_row_id(