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_view.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_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 22f90808fdc..37a60d2dbb7 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1934,19 +1934,19 @@ bool check_key_in_view(THD *thd, TABLE_LIST *view) this operation should not have influence on Field::query_id, to avoid marking as used fields which are not used */ - enum_mark_columns save_mark_used_columns= thd->mark_used_columns; - thd->mark_used_columns= MARK_COLUMNS_NONE; - DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns)); + enum_column_usage saved_column_usage= thd->column_usage; + thd->column_usage= MARK_COLUMNS_NONE; + DBUG_PRINT("info", ("thd->column_usage: %d", thd->column_usage)); for (Field_translator *fld= trans; fld < end_of_trans; fld++) { if (!fld->item->fixed && fld->item->fix_fields(thd, &fld->item)) { - thd->mark_used_columns= save_mark_used_columns; + thd->column_usage= saved_column_usage; DBUG_RETURN(TRUE); } } - 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)); } /* Loop over all keys to see if a unique-not-null key is used */ for (;key_info != key_info_end ; key_info++) |