revision-id: 2901eeaa39148a9a3e1f12535a325748a665851f (mariadb-10.6.1-103-g2901eeaa391) parent(s): 09524445b46821af4b6264564a013bcfe3f148fb author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-08-30 12:31:42 +0300 message: Trivial code cleanup --- sql/sql_statistics.cc | 4 +--- strings/json_lib.c | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index dd46649c768..4beb3ec4448 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -2915,6 +2915,7 @@ bool Column_statistics_collected::add() return err; } + /** @brief Get the results of aggregation when collecting the statistics on a column @@ -3617,9 +3618,6 @@ int read_histograms_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) TABLE_STATISTICS_CB *stats_cb= &table->s->stats_cb; DBUG_ENTER("read_histograms_for_table"); - // histograms-todo: why do we use synchronization here, when we load - // histogram for the TABLE object, not TABLE_SHARE? - // is it because of the use of stats_cb->mem_root? if (stats_cb->start_histograms_load()) { //uchar *histogram= (uchar *) alloc_root(&stats_cb->mem_root, diff --git a/strings/json_lib.c b/strings/json_lib.c index b61eb634a20..58efac30dc0 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -2028,6 +2028,7 @@ enum json_types json_get_object_nkey(const char *js __attribute__((unused)), return JSV_NOTHING; } + /** Check if json is valid (well-formed) @retval 0 - success, json is well-formed