mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 23:35:32 +02:00
dict0dict.h, dict0dict.c, ha_innodb.cc:
Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp() sql/ha_innodb.cc: Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp() storage/innobase/dict/dict0dict.c: Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp() storage/innobase/include/dict0dict.h: Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
This commit is contained in:
parent
e89870f16c
commit
1ff3d3c9fc
3 changed files with 22 additions and 2 deletions
|
|
@ -2312,7 +2312,7 @@ ha_innobase::get_row_type() const
|
|||
row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt;
|
||||
|
||||
if (prebuilt && prebuilt->table) {
|
||||
if (dict_table_is_comp(prebuilt->table)) {
|
||||
if (innodb_dict_table_is_comp(prebuilt->table)) {
|
||||
return(ROW_TYPE_COMPACT);
|
||||
} else {
|
||||
return(ROW_TYPE_REDUNDANT);
|
||||
|
|
@ -3705,7 +3705,7 @@ calc_row_difference(
|
|||
TRUE,
|
||||
new_mysql_row_col,
|
||||
col_pack_len,
|
||||
dict_table_is_comp(prebuilt->table));
|
||||
innodb_dict_table_is_comp(prebuilt->table));
|
||||
ufield->new_val.data = dfield.data;
|
||||
ufield->new_val.len = dfield.len;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -4520,3 +4520,15 @@ dict_index_name_print(
|
|||
fputs(" of table ", file);
|
||||
ut_print_name(file, trx, index->table_name);
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
Export an inlined function for use in ha_innodb.c. */
|
||||
ibool
|
||||
innodb_dict_table_is_comp(
|
||||
/*===============*/
|
||||
/* out: TRUE if table uses the
|
||||
compact page format */
|
||||
const dict_table_t* table) /* in: table */
|
||||
{
|
||||
return dict_table_is_comp(table);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -496,6 +496,14 @@ dict_table_is_comp(
|
|||
compact page format */
|
||||
const dict_table_t* table); /* in: table */
|
||||
/************************************************************************
|
||||
Non inlined version of 'dict_table_is_comp' above. */
|
||||
ibool
|
||||
innodb_dict_table_is_comp(
|
||||
/*===============*/
|
||||
/* out: TRUE if table uses the
|
||||
compact page format */
|
||||
const dict_table_t* table); /* in: table */
|
||||
/************************************************************************
|
||||
Checks if a column is in the ordering columns of the clustered index of a
|
||||
table. Column prefixes are treated like whole columns. */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue