From d03daaf8a8b1088085e3ba5fd28320b5d2652700 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Tue, 14 Sep 2021 20:18:07 +0300 Subject: [PATCH] Use JSON_NAME, not the "histogram_hb_v2" constant --- sql/opt_histogram_json.cc | 2 +- sql/opt_histogram_json.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 9d2da136ced..66377d55aec 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -285,7 +285,7 @@ bool Histogram_json_hb::parse(MEM_ROOT *mem_root, Field *field, const char *hist_array; int hist_array_len; if (JSV_ARRAY != json_get_object_key(obj1, obj1 + obj1_len, - "histogram_hb_v2", &hist_array, + JSON_NAME, &hist_array, &hist_array_len)) { err_pos= obj1; diff --git a/sql/opt_histogram_json.h b/sql/opt_histogram_json.h index f9934a9db3a..df7547b31ee 100644 --- a/sql/opt_histogram_json.h +++ b/sql/opt_histogram_json.h @@ -31,8 +31,8 @@ ] } - The histogram is an object with single member named "histogram_hb_v2". - The value of that member is an array of buckets. + The histogram is an object with single member named Histogram_json_hb:: + JSON_NAME. The value of that member is an array of buckets. Each bucket is an object with these members: "start" - the first value in the bucket. "size" - fraction of table rows that is contained in the bucket.