1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove space before #ifdef

Browse Source
This commit is contained in:
Marko Mäkelä 2018-12-13 12:15:18 +02:00
parent 5f5e73f1fe
commit 5ab91f5914
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_statistics.cc
View File

@ -3601,10 +3601,10 @@ void set_statistics_for_table(THD *thd, TABLE *table)
Ideally, EITS should provide per-partition statistics but this is not Ideally, EITS should provide per-partition statistics but this is not
implemented currently. implemented currently.
*/ */
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
if (table->part_info) if (table->part_info)
table->used_stat_records= table->file->stats.records; table->used_stat_records= table->file->stats.records;
#endif #endif
KEY *key_info, *key_info_end; KEY *key_info, *key_info_end;
for (key_info= table->key_info, key_info_end= key_info+table->s->keys; for (key_info= table->key_info, key_info_end= key_info+table->s->keys;
@ -3931,9 +3931,6 @@ bool is_stat_table(const char *db, const char *table)
bool is_eits_usable(Field *field) 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 (1): checks if we have EITS statistics for a particular column
(2): Don't use EITS for GEOMETRY columns (2): Don't use EITS for GEOMETRY columns
@ -3942,12 +3939,11 @@ bool is_eits_usable(Field *field)
such columns would be handled during partition pruning. such columns would be handled during partition pruning.
*/ */
Column_statistics* col_stats= field->read_stats; Column_statistics* col_stats= field->read_stats;
if (col_stats && !col_stats->no_stat_values_provided() && //(1) return col_stats && !col_stats->no_stat_values_provided() && //(1)
field->type() != MYSQL_TYPE_GEOMETRY //(2) field->type() != MYSQL_TYPE_GEOMETRY && //(2)
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
&& (!part_info || !part_info->field_in_partition_expr(field)) //(3) (!field->table->part_info ||
#endif !field->table->part_info->field_in_partition_expr(field)) && //(3)
) #endif
return TRUE; true;
return FALSE;
} }