diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-09 19:43:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-12 22:49:10 +0100 |
| commit | 103715d0faab00c20f2d7e832fdca031952f36d7 (patch) | |
| tree | a0ee11bf42a5366ea922a806f3a8329e4e791cd7 /sql/sql_partition.cc | |
| parent | 8cd3d2d941aedb421eec49d28f078d3350b8744f (diff) | |
| download | mariadb-git-103715d0faab00c20f2d7e832fdca031952f36d7.tar.gz | |
cleanup: renames
enum_mark_columns -> enum_column_usage
mark_used_columns -> column_usage
further commits will replace MARK_COLUMN_NONE with
COLUMN_READ and COLUMN_WRITE that convey the intention
without causing columns to be marked
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index a4d940670e5..826095154e8 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1583,15 +1583,15 @@ bool fix_partition_func(THD *thd, TABLE *table, { bool result= TRUE; partition_info *part_info= table->part_info; - enum_mark_columns save_mark_used_columns= thd->mark_used_columns; + enum_column_usage saved_column_usage= thd->column_usage; DBUG_ENTER("fix_partition_func"); if (part_info->fixed) { DBUG_RETURN(FALSE); } - thd->mark_used_columns= MARK_COLUMNS_NONE; - DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns)); + thd->column_usage= MARK_COLUMNS_NONE; + DBUG_PRINT("info", ("thd->column_usage: %d", thd->column_usage)); if (!is_create_table_ind || thd->lex->sql_command != SQLCOM_CREATE_TABLE) @@ -1756,8 +1756,8 @@ bool fix_partition_func(THD *thd, TABLE *table, table->file->set_part_info(part_info); result= FALSE; end: - thd->mark_used_columns= save_mark_used_columns; - DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns)); + thd->column_usage= saved_column_usage; + DBUG_PRINT("info", ("thd->column_usage: %d", thd->column_usage)); DBUG_RETURN(result); } |