Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2020-09-21 12:29:00 +03:00
commit 3a423088ac
56 changed files with 982 additions and 1742 deletions

View file

@ -461,11 +461,7 @@ 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 */
MY_ATTRIBUTE((nonnull));
char* str); /*!< in: buffer to write the id to */
/******************************************************************//**
Read the table id from the string generated by fts_write_object_id().
@return TRUE if parse successful */