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

28
storage/innobase/include/fts0priv.ic
View file

@ -26,7 +26,7 @@ Created 2011/11/12 Sunny Bains
/******************************************************************//**
Write the table id to the given buffer (including final NUL). Buffer must be
at least FTS_AUX_MIN_TABLE_ID_LENGTH bytes long.
@return number of bytes written */
@return number of bytes written */
UNIV_INLINE
int
fts_write_object_id(
@ -53,10 +53,10 @@ fts_write_object_id(
/* Use this to construct old(5.6.14 and 5.7.3) windows
ambiguous aux table names */
DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
return(sprintf(str, "%016" PRIu64, id)););
return(sprintf(str, "%016lu", id)););
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
return(sprintf(str, UINT64PFx, id)););
return(sprintf(str, "%016lx", id)););
#endif /* _WIN32 */
@ -66,16 +66,16 @@ fts_write_object_id(
// FIXME: Use ut_snprintf(), so does following one.
return(sprintf(str, "%016llu", id));
#else /* _WIN32 */
return(sprintf(str, "%016" PRIu64, id));
return(sprintf(str, "%016lu", id));
#endif /* _WIN32 */
}
return(sprintf(str, UINT64PFx, id));
return(sprintf(str, "%016lx", id));
}
/******************************************************************//**
Read the table id from the string generated by fts_write_object_id().
@return TRUE if parse successful */
@return TRUE if parse successful */
UNIV_INLINE
ibool
fts_read_object_id(
@ -86,12 +86,12 @@ fts_read_object_id(
/* NOTE: this func doesn't care about whether current table
is set with HEX_NAME, the user of the id read here will check
if the id is HEX or DEC and do the right thing with it. */
return(sscanf(str, UINT64PFx, id) == 1);
return(sscanf(str, "%016lx", id) == 1);
}
/******************************************************************//**
Compare two fts_trx_table_t instances.
@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
UNIV_INLINE
int
fts_trx_table_cmp(
@ -99,8 +99,11 @@ fts_trx_table_cmp(
const void* p1, /*!< in: id1 */
const void* p2) /*!< in: id2 */
{
const dict_table_t* table1 = (*(const fts_trx_table_t**) p1)->table;
const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
const dict_table_t* table1
= (*static_cast<const fts_trx_table_t* const*>(p1))->table;
const dict_table_t* table2
= (*static_cast<const fts_trx_table_t* const*>(p2))->table;
return((table1->id > table2->id)
? 1
@ -119,8 +122,9 @@ fts_trx_table_id_cmp(
const void* p1, /*!< in: id1 */
const void* p2) /*!< in: id2 */
{
const ullint* table_id = (const ullint*) p1;
const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
const uintmax_t* table_id = static_cast<const uintmax_t*>(p1);
const dict_table_t* table2
= (*static_cast<const fts_trx_table_t* const*>(p2))->table;
return((*table_id > table2->id)
? 1