summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2021-09-14 20:18:07 +0300
committerSergei Petrunia <psergey@askmonty.org>2021-09-14 20:18:07 +0300
commit4ea73d61e36f7d4b9553f718675e00e6a9be82d0 (patch)
tree98bc64bc8f7917b6add88b2d82f83c09c1c11eb0
parent4382af371345e1a3179d5f6a8ceb2e2774a29485 (diff)
downloadmariadb-git-bb-10.7-mdev26519.tar.gz
Use JSON_NAME, not the "histogram_hb_v2" constantbb-10.7-mdev26519
-rw-r--r--sql/opt_histogram_json.cc2
-rw-r--r--sql/opt_histogram_json.h4
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.