diff options
| -rw-r--r-- | sql/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0dict.c | 12 | ||||
| -rw-r--r-- | storage/innobase/include/dict0dict.h | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 1f849f89272..6c8559a1077 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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 { diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c index 720074a4911..1fac5e26fa9 100644 --- a/storage/innobase/dict/dict0dict.c +++ b/storage/innobase/dict/dict0dict.c @@ -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); +} diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index dc8c72b0e7d..9de5c5b52d5 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -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. */ |