Merge branch '10.3'

This commit is contained in:
Sergei Golubchik 2018-10-01 10:28:22 +02:00
commit 9556d56da2
2 changed files with 2 additions and 2 deletions

View File

@ -611,7 +611,7 @@ dict_table_has_column(
}
/** Retrieve the column name.
@param[in] table table name */
@param[in] table the table of this column */
const char* dict_col_t::name(const dict_table_t& table) const
{
ut_ad(table.magic_n == DICT_TABLE_MAGIC_N);

View File

@ -601,7 +601,7 @@ struct dict_col_t{
} def_val;
/** Retrieve the column name.
@param[in] table table name */
@param[in] table the table of this column */
const char* name(const dict_table_t& table) const;
/** @return whether this is a virtual column */