"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "storage/innobase/handler/ha_innodb.h" between
mariadb-10.2.21.tar.gz and mariadb-10.2.22.tar.gz

About: MariaDB is a relational database management system (a drop-in replacement for MySQL). Stable (GA) release (10.2).

ha_innodb.h  (mariadb-10.2.21):ha_innodb.h  (mariadb-10.2.22)
/***************************************************************************** /*****************************************************************************
Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2018, MariaDB Corporation. Copyright (c) 2013, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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 the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License. Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but WITHOUT 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 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. 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 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., this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
*****************************************************************************/ *****************************************************************************/
#ifdef WITH_WSREP
# include <mysql/service_wsrep.h>
# include "../../../wsrep/wsrep_api.h"
#endif /* WITH_WSREP */
/* The InnoDB handler: the interface between MySQL and InnoDB. */ /* The InnoDB handler: the interface between MySQL and InnoDB. */
/** "GEN_CLUST_INDEX" is the name reserved for InnoDB default /** "GEN_CLUST_INDEX" is the name reserved for InnoDB default
system clustered index when there is no primary key. */ system clustered index when there is no primary key. */
extern const char innobase_index_reserve_name[]; extern const char innobase_index_reserve_name[];
/** Prebuilt structures in an InnoDB table handle used within MySQL */ /** Prebuilt structures in an InnoDB table handle used within MySQL */
struct row_prebuilt_t; struct row_prebuilt_t;
/** InnoDB transaction */ /** InnoDB transaction */
skipping to change at line 436 skipping to change at line 441
protected: protected:
inline void update_thd(THD* thd); inline void update_thd(THD* thd);
void update_thd(); void update_thd();
int general_fetch(uchar* buf, uint direction, uint match_mode); int general_fetch(uchar* buf, uint direction, uint match_mode);
int change_active_index(uint keynr); int change_active_index(uint keynr);
dict_index_t* innobase_get_index(uint keynr); dict_index_t* innobase_get_index(uint keynr);
#ifdef WITH_WSREP #ifdef WITH_WSREP
int wsrep_append_keys(THD *thd, bool shared, int wsrep_append_keys(THD *thd, wsrep_key_type key_type,
const uchar* record0, const uchar* record1); const uchar* record0, const uchar* record1);
#endif #endif
/** Builds a 'template' to the prebuilt struct. /** Builds a 'template' to the prebuilt struct.
The template is used in fast retrieval of just those column The template is used in fast retrieval of just those column
values MySQL needs in its processing. values MySQL needs in its processing.
@param whole_row true if access is needed to a whole row, @param whole_row true if access is needed to a whole row,
false if accessing individual fields is enough */ false if accessing individual fields is enough */
void build_template(bool whole_row); void build_template(bool whole_row);
skipping to change at line 561 skipping to change at line 566
@param thd Thread object. @param thd Thread object.
@return NULL or pointer to partition_info working copy. */ @return NULL or pointer to partition_info working copy. */
/* JAN: TODO: MySQL 5.7 Partitioning /* JAN: TODO: MySQL 5.7 Partitioning
partition_info* partition_info*
thd_get_work_part_info( thd_get_work_part_info(
THD* thd); THD* thd);
*/ */
struct trx_t; struct trx_t;
#ifdef WITH_WSREP #ifdef WITH_WSREP
#include <mysql/service_wsrep.h>
//extern "C" int wsrep_trx_order_before(void *thd1, void *thd2); //extern "C" int wsrep_trx_order_before(void *thd1, void *thd2);
extern "C" bool wsrep_thd_is_wsrep_on(THD *thd); extern "C" bool wsrep_thd_is_wsrep_on(THD *thd);
extern "C" void wsrep_thd_set_exec_mode(THD *thd, enum wsrep_exec_mode mode); extern "C" void wsrep_thd_set_exec_mode(THD *thd, enum wsrep_exec_mode mode);
extern "C" void wsrep_thd_set_query_state( extern "C" void wsrep_thd_set_query_state(
THD *thd, enum wsrep_query_state state); THD *thd, enum wsrep_query_state state);
extern "C" void wsrep_thd_set_trx_to_replay(THD *thd, uint64 trx_id); extern "C" void wsrep_thd_set_trx_to_replay(THD *thd, uint64 trx_id);
skipping to change at line 611 skipping to change at line 615
and returns true. and returns true.
@return true if the index name matches the reserved name */ @return true if the index name matches the reserved name */
bool bool
innobase_index_name_is_reserved( innobase_index_name_is_reserved(
THD* thd, /*!< in/out: MySQL connection */ THD* thd, /*!< in/out: MySQL connection */
const KEY* key_info, /*!< in: Indexes to be created */ const KEY* key_info, /*!< in: Indexes to be created */
ulint num_of_keys) /*!< in: Number of indexes to ulint num_of_keys) /*!< in: Number of indexes to
be created. */ be created. */
MY_ATTRIBUTE((nonnull(1), warn_unused_result)); MY_ATTRIBUTE((nonnull(1), warn_unused_result));
#ifdef WITH_WSREP
//extern "C" int wsrep_trx_is_aborting(void *thd_ptr);
#endif
/** Parse hint for table and its indexes, and update the information /** Parse hint for table and its indexes, and update the information
in dictionary. in dictionary.
@param[in] thd Connection thread @param[in] thd Connection thread
@param[in,out] table Target table @param[in,out] table Target table
@param[in] table_share Table definition */ @param[in] table_share Table definition */
void void
innobase_parse_hint_from_comment( innobase_parse_hint_from_comment(
THD* thd, THD* thd,
dict_table_t* table, dict_table_t* table,
const TABLE_SHARE* table_share); const TABLE_SHARE* table_share);
 End of changes. 5 change blocks. 
7 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)