Skip to content

Commit

Permalink
Remove space before #ifdef
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-m committed Dec 13, 2018
1 parent 5f5e73f commit 5ab91f5
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions sql/sql_statistics.cc
Expand Up @@ -3601,10 +3601,10 @@ void set_statistics_for_table(THD *thd, TABLE *table)
Ideally, EITS should provide per-partition statistics but this is not
implemented currently.
*/
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (table->part_info)
table->used_stat_records= table->file->stats.records;
#endif
#endif

KEY *key_info, *key_info_end;
for (key_info= table->key_info, key_info_end= key_info+table->s->keys;
Expand Down Expand Up @@ -3931,9 +3931,6 @@ bool is_stat_table(const char *db, const char *table)

bool is_eits_usable(Field *field)
{
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= field->table->part_info;
#endif
/*
(1): checks if we have EITS statistics for a particular column
(2): Don't use EITS for GEOMETRY columns
Expand All @@ -3942,12 +3939,11 @@ bool is_eits_usable(Field *field)
such columns would be handled during partition pruning.
*/
Column_statistics* col_stats= field->read_stats;
if (col_stats && !col_stats->no_stat_values_provided() && //(1)
field->type() != MYSQL_TYPE_GEOMETRY //(2)
#ifdef WITH_PARTITION_STORAGE_ENGINE
&& (!part_info || !part_info->field_in_partition_expr(field)) //(3)
#endif
)
return TRUE;
return FALSE;
return col_stats && !col_stats->no_stat_values_provided() && //(1)
field->type() != MYSQL_TYPE_GEOMETRY && //(2)
#ifdef WITH_PARTITION_STORAGE_ENGINE
(!field->table->part_info ||
!field->table->part_info->field_in_partition_expr(field)) && //(3)
#endif
true;
}

0 comments on commit 5ab91f5

Please sign in to comment.