mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +01:00
2e814d4702
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
134 lines
4.2 KiB
Text
134 lines
4.2 KiB
Text
/*****************************************************************************
|
|
|
|
Copyright (c) 2011, 2016, 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
|
|
Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/******************************************************************//**
|
|
@file include/fts0priv.ic
|
|
Full text search internal header file
|
|
|
|
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 */
|
|
UNIV_INLINE
|
|
int
|
|
fts_write_object_id(
|
|
/*================*/
|
|
ib_id_t id, /* in: a table/index id */
|
|
char* str, /* in: buffer to write the id to */
|
|
bool hex_format MY_ATTRIBUTE((unused)))
|
|
/* in: true for fixed hex format,
|
|
false for old ambiguous format */
|
|
{
|
|
|
|
#ifdef _WIN32
|
|
|
|
DBUG_EXECUTE_IF("innodb_test_wrong_non_windows_fts_aux_table_name",
|
|
return(sprintf(str, UINT64PFx, id)););
|
|
|
|
/* Use this to construct old(5.6.14 and 5.7.3) windows
|
|
ambiguous aux table names */
|
|
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
|
|
return(sprintf(str, "%016llu", id)););
|
|
|
|
#else /* _WIN32 */
|
|
|
|
/* 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, "%016lu", id)););
|
|
|
|
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
|
|
return(sprintf(str, "%016lx", id)););
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
/* As above, but this is only for those tables failing to rename. */
|
|
if (!hex_format) {
|
|
#ifdef _WIN32
|
|
// FIXME: Use ut_snprintf(), so does following one.
|
|
return(sprintf(str, "%016llu", id));
|
|
#else /* _WIN32 */
|
|
return(sprintf(str, "%016lu", id));
|
|
#endif /* _WIN32 */
|
|
}
|
|
|
|
return(sprintf(str, "%016lx", id));
|
|
}
|
|
|
|
/******************************************************************//**
|
|
Read the table id from the string generated by fts_write_object_id().
|
|
@return TRUE if parse successful */
|
|
UNIV_INLINE
|
|
ibool
|
|
fts_read_object_id(
|
|
/*===============*/
|
|
ib_id_t* id, /* out: an id */
|
|
const char* str) /* in: buffer to read from */
|
|
{
|
|
/* 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, "%016lx", id) == 1);
|
|
}
|
|
|
|
/******************************************************************//**
|
|
Compare two fts_trx_table_t instances.
|
|
@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
|
|
UNIV_INLINE
|
|
int
|
|
fts_trx_table_cmp(
|
|
/*==============*/
|
|
const void* p1, /*!< in: id1 */
|
|
const void* p2) /*!< in: id2 */
|
|
{
|
|
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
|
|
: (table1->id == table2->id)
|
|
? 0
|
|
: -1);
|
|
}
|
|
|
|
/******************************************************************//**
|
|
Compare a table id with a fts_trx_table_t table id.
|
|
@return < 0 if n1 < n2, 0 if n1 == n2,> 0 if n1 > n2 */
|
|
UNIV_INLINE
|
|
int
|
|
fts_trx_table_id_cmp(
|
|
/*=================*/
|
|
const void* p1, /*!< in: id1 */
|
|
const void* p2) /*!< in: id2 */
|
|
{
|
|
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
|
|
: (*table_id == table2->id)
|
|
? 0
|
|
: -1);
|
|
}
|