Merge 10.3 into 10.4

1 files changed, 15 insertions, 1 deletions

diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 4e7cda137c2..245a8353d35 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -2,7 +2,7 @@
 #define ITEM_GEOFUNC_INCLUDED
 
 /* Copyright (c) 2000, 2016 Oracle and/or its affiliates.
-   Copyright (C) 2011, 2016, MariaDB
+   Copyright (C) 2011, 2021, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -934,6 +934,20 @@ public:
 };
 
 
+class Item_func_sphere_distance: public Item_real_func
+{
+  double spherical_distance_points(Geometry *g1, Geometry *g2,
+                                   const double sphere_r);
+public:
+  Item_func_sphere_distance(THD *thd, List<Item> &list):
+    Item_real_func(thd, list) {}
+  double val_real();
+  const char *func_name() const { return "st_distance_sphere"; }
+  Item *get_copy(THD *thd)
+  { return get_item_copy<Item_func_sphere_distance>(thd, this); }
+};
+
+
 class Item_func_pointonsurface: public Item_geometry_func_args_geometry
 {
   String tmp_value;