Commit 8f6fdc86 authored by marko's avatar marko

Do not use inlined functions in ha_innodb.cc.

Add dict_table_is_comp_noninline().  Replace calls to dict_table_is_comp()
in ha_innodb.cc with dict_table_is_comp_noninline().
parent a7af1d39
...@@ -657,6 +657,19 @@ dict_table_get_nth_col_pos( ...@@ -657,6 +657,19 @@ dict_table_get_nth_col_pos(
n)); n));
} }
/************************************************************************
Check whether the table uses the compact page format. */
ibool
dict_table_is_comp_noninline(
/*=========================*/
/* out: TRUE if table uses the
compact page format */
const dict_table_t* table) /* in: table */
{
return(dict_table_is_comp(table));
}
/************************************************************************ /************************************************************************
Checks if a column is in the ordering columns of the clustered index of a Checks if a column is in the ordering columns of the clustered index of a
table. Column prefixes are treated like whole columns. */ table. Column prefixes are treated like whole columns. */
......
...@@ -2312,7 +2312,7 @@ ha_innobase::get_row_type() const ...@@ -2312,7 +2312,7 @@ ha_innobase::get_row_type() const
row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt; row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt;
if (prebuilt && prebuilt->table) { if (prebuilt && prebuilt->table) {
if (dict_table_is_comp(prebuilt->table)) { if (dict_table_is_comp_noninline(prebuilt->table)) {
return(ROW_TYPE_COMPACT); return(ROW_TYPE_COMPACT);
} else { } else {
return(ROW_TYPE_REDUNDANT); return(ROW_TYPE_REDUNDANT);
...@@ -3705,7 +3705,8 @@ calc_row_difference( ...@@ -3705,7 +3705,8 @@ calc_row_difference(
TRUE, TRUE,
new_mysql_row_col, new_mysql_row_col,
col_pack_len, col_pack_len,
dict_table_is_comp(prebuilt->table)); dict_table_is_comp_noninline(
prebuilt->table));
ufield->new_val.data = dfield.data; ufield->new_val.data = dfield.data;
ufield->new_val.len = dfield.len; ufield->new_val.len = dfield.len;
} else { } else {
......
...@@ -504,6 +504,15 @@ dict_table_is_comp( ...@@ -504,6 +504,15 @@ dict_table_is_comp(
compact page format */ compact page format */
const dict_table_t* table); /* in: table */ const dict_table_t* table); /* in: table */
/************************************************************************ /************************************************************************
Check whether the table uses the compact page format. */
ibool
dict_table_is_comp_noninline(
/*=========================*/
/* 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 Checks if a column is in the ordering columns of the clustered index of a
table. Column prefixes are treated like whole columns. */ table. Column prefixes are treated like whole columns. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment