Merge 10.8 into 10.9

1 files changed, 109 insertions, 111 deletions

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index fc1a4b20e8c..8714417a77d 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -1531,9 +1531,7 @@ exit:
 }
 
 
-Item_func_spatial_operation::~Item_func_spatial_operation()
-{
-}
+Item_func_spatial_operation::~Item_func_spatial_operation() = default;
 
 
 String *Item_func_spatial_operation::val_str(String *str_value)
@@ -2788,8 +2786,8 @@ public:
   static Create_func_area s_singleton;
 
 protected:
-  Create_func_area() {}
-  virtual ~Create_func_area() {}
+  Create_func_area() = default;
+  virtual ~Create_func_area() = default;
 };
 
 
@@ -2804,8 +2802,8 @@ public:
   static Create_func_as_wkb s_singleton;
 
 protected:
-  Create_func_as_wkb() {}
-  virtual ~Create_func_as_wkb() {}
+  Create_func_as_wkb() = default;
+  virtual ~Create_func_as_wkb() = default;
 };
 
 
@@ -2820,8 +2818,8 @@ public:
   static Create_func_as_wkt s_singleton;
 
 protected:
-  Create_func_as_wkt() {}
-  virtual ~Create_func_as_wkt() {}
+  Create_func_as_wkt() = default;
+  virtual ~Create_func_as_wkt() = default;
 };
 
 
@@ -2837,8 +2835,8 @@ public:
   static Create_func_centroid s_singleton;
 
 protected:
-  Create_func_centroid() {}
-  virtual ~Create_func_centroid() {}
+  Create_func_centroid() = default;
+  virtual ~Create_func_centroid() = default;
 };
 
 
@@ -2853,8 +2851,8 @@ public:
   static Create_func_convexhull s_singleton;
 
 protected:
-  Create_func_convexhull() {}
-  virtual ~Create_func_convexhull() {}
+  Create_func_convexhull() = default;
+  virtual ~Create_func_convexhull() = default;
 };
 
 
@@ -2869,8 +2867,8 @@ public:
   static Create_func_pointonsurface s_singleton;
 
 protected:
-  Create_func_pointonsurface() {}
-  virtual ~Create_func_pointonsurface() {}
+  Create_func_pointonsurface() = default;
+  virtual ~Create_func_pointonsurface() = default;
 };
 
 
@@ -2886,8 +2884,8 @@ public:
   static Create_func_mbr_contains s_singleton;
 
 protected:
-  Create_func_mbr_contains() {}
-  virtual ~Create_func_mbr_contains() {}
+  Create_func_mbr_contains() = default;
+  virtual ~Create_func_mbr_contains() = default;
 };
 
 
@@ -2902,8 +2900,8 @@ public:
   static Create_func_contains s_singleton;
 
 protected:
-  Create_func_contains() {}
-  virtual ~Create_func_contains() {}
+  Create_func_contains() = default;
+  virtual ~Create_func_contains() = default;
 };
 
 
@@ -2918,8 +2916,8 @@ public:
   static Create_func_crosses s_singleton;
 
 protected:
-  Create_func_crosses() {}
-  virtual ~Create_func_crosses() {}
+  Create_func_crosses() = default;
+  virtual ~Create_func_crosses() = default;
 };
 
 
@@ -2934,8 +2932,8 @@ public:
   static Create_func_dimension s_singleton;
 
 protected:
-  Create_func_dimension() {}
-  virtual ~Create_func_dimension() {}
+  Create_func_dimension() = default;
+  virtual ~Create_func_dimension() = default;
 };
 
 
@@ -2951,8 +2949,8 @@ public:
   static Create_func_mbr_disjoint s_singleton;
 
 protected:
-  Create_func_mbr_disjoint() {}
-  virtual ~Create_func_mbr_disjoint() {}
+  Create_func_mbr_disjoint() = default;
+  virtual ~Create_func_mbr_disjoint() = default;
 };
 
 
@@ -2967,8 +2965,8 @@ public:
   static Create_func_disjoint s_singleton;
 
 protected:
-  Create_func_disjoint() {}
-  virtual ~Create_func_disjoint() {}
+  Create_func_disjoint() = default;
+  virtual ~Create_func_disjoint() = default;
 };
 
 
@@ -2983,8 +2981,8 @@ public:
   static Create_func_distance s_singleton;
 
 protected:
-  Create_func_distance() {}
-  virtual ~Create_func_distance() {}
+  Create_func_distance() = default;
+  virtual ~Create_func_distance() = default;
 };
 
 
@@ -2996,8 +2994,8 @@ public:
   static Create_func_distance_sphere s_singleton;
 
 protected:
-  Create_func_distance_sphere() {}
-  virtual ~Create_func_distance_sphere() {}
+  Create_func_distance_sphere() = default;
+  virtual ~Create_func_distance_sphere() = default;
 };
 
 
@@ -3031,8 +3029,8 @@ public:
   static Create_func_endpoint s_singleton;
 
 protected:
-  Create_func_endpoint() {}
-  virtual ~Create_func_endpoint() {}
+  Create_func_endpoint() = default;
+  virtual ~Create_func_endpoint() = default;
 };
 
 
@@ -3047,8 +3045,8 @@ public:
   static Create_func_envelope s_singleton;
 
 protected:
-  Create_func_envelope() {}
-  virtual ~Create_func_envelope() {}
+  Create_func_envelope() = default;
+  virtual ~Create_func_envelope() = default;
 };
 
 class Create_func_boundary : public Create_func_arg1
@@ -3062,8 +3060,8 @@ public:
   static Create_func_boundary s_singleton;
 
 protected:
-  Create_func_boundary() {}
-  virtual ~Create_func_boundary() {}
+  Create_func_boundary() = default;
+  virtual ~Create_func_boundary() = default;
 };
 
 
@@ -3079,8 +3077,8 @@ public:
   static Create_func_mbr_equals s_singleton;
 
 protected:
-  Create_func_mbr_equals() {}
-  virtual ~Create_func_mbr_equals() {}
+  Create_func_mbr_equals() = default;
+  virtual ~Create_func_mbr_equals() = default;
 };
 
 
@@ -3096,8 +3094,8 @@ public:
   static Create_func_equals s_singleton;
 
 protected:
-  Create_func_equals() {}
-  virtual ~Create_func_equals() {}
+  Create_func_equals() = default;
+  virtual ~Create_func_equals() = default;
 };
 
 
@@ -3113,8 +3111,8 @@ public:
   static Create_func_exteriorring s_singleton;
 
 protected:
-  Create_func_exteriorring() {}
-  virtual ~Create_func_exteriorring() {}
+  Create_func_exteriorring() = default;
+  virtual ~Create_func_exteriorring() = default;
 };
 
 
@@ -3128,8 +3126,8 @@ public:
   static Create_func_geometry_from_text s_singleton;
 
 protected:
-  Create_func_geometry_from_text() {}
-  virtual ~Create_func_geometry_from_text() {}
+  Create_func_geometry_from_text() = default;
+  virtual ~Create_func_geometry_from_text() = default;
 };
 
 
@@ -3179,8 +3177,8 @@ public:
   static Create_func_geometry_from_wkb s_singleton;
 
 protected:
-  Create_func_geometry_from_wkb() {}
-  virtual ~Create_func_geometry_from_wkb() {}
+  Create_func_geometry_from_wkb() = default;
+  virtual ~Create_func_geometry_from_wkb() = default;
 };
 
 
@@ -3229,8 +3227,8 @@ public:
   static Create_func_geometry_from_json s_singleton;
 
 protected:
-  Create_func_geometry_from_json() {}
-  virtual ~Create_func_geometry_from_json() {}
+  Create_func_geometry_from_json() = default;
+  virtual ~Create_func_geometry_from_json() = default;
 };
 
 
@@ -3289,8 +3287,8 @@ public:
   static Create_func_as_geojson s_singleton;
 
 protected:
-  Create_func_as_geojson() {}
-  virtual ~Create_func_as_geojson() {}
+  Create_func_as_geojson() = default;
+  virtual ~Create_func_as_geojson() = default;
 };
 
 
@@ -3349,8 +3347,8 @@ public:
   static Create_func_geometry_type s_singleton;
 
 protected:
-  Create_func_geometry_type() {}
-  virtual ~Create_func_geometry_type() {}
+  Create_func_geometry_type() = default;
+  virtual ~Create_func_geometry_type() = default;
 };
 
 
@@ -3366,8 +3364,8 @@ public:
   static Create_func_geometryn s_singleton;
 
 protected:
-  Create_func_geometryn() {}
-  virtual ~Create_func_geometryn() {}
+  Create_func_geometryn() = default;
+  virtual ~Create_func_geometryn() = default;
 };
 
 
@@ -3383,8 +3381,8 @@ public:
   static Create_func_gis_debug s_singleton;
 
 protected:
-  Create_func_gis_debug() {}
-  virtual ~Create_func_gis_debug() {}
+  Create_func_gis_debug() = default;
+  virtual ~Create_func_gis_debug() = default;
 };
 #endif
 
@@ -3400,8 +3398,8 @@ public:
   static Create_func_glength s_singleton;
 
 protected:
-  Create_func_glength() {}
-  virtual ~Create_func_glength() {}
+  Create_func_glength() = default;
+  virtual ~Create_func_glength() = default;
 };
 
 
@@ -3417,8 +3415,8 @@ public:
   static Create_func_interiorringn s_singleton;
 
 protected:
-  Create_func_interiorringn() {}
-  virtual ~Create_func_interiorringn() {}
+  Create_func_interiorringn() = default;
+  virtual ~Create_func_interiorringn() = default;
 };
 
 
@@ -3433,8 +3431,8 @@ public:
   static Create_func_relate s_singleton;
 
 protected:
-  Create_func_relate() {}
-  virtual ~Create_func_relate() {}
+  Create_func_relate() = default;
+  virtual ~Create_func_relate() = default;
 };
 
 
@@ -3450,8 +3448,8 @@ public:
   static Create_func_mbr_intersects s_singleton;
 
 protected:
-  Create_func_mbr_intersects() {}
-  virtual ~Create_func_mbr_intersects() {}
+  Create_func_mbr_intersects() = default;
+  virtual ~Create_func_mbr_intersects() = default;
 };
 
 
@@ -3467,8 +3465,8 @@ public:
   static Create_func_intersects s_singleton;
 
 protected:
-  Create_func_intersects() {}
-  virtual ~Create_func_intersects() {}
+  Create_func_intersects() = default;
+  virtual ~Create_func_intersects() = default;
 };
 
 
@@ -3484,8 +3482,8 @@ public:
   static Create_func_intersection s_singleton;
 
 protected:
-  Create_func_intersection() {}
-  virtual ~Create_func_intersection() {}
+  Create_func_intersection() = default;
+  virtual ~Create_func_intersection() = default;
 };
 
 
@@ -3501,8 +3499,8 @@ public:
   static Create_func_difference s_singleton;
 
 protected:
-  Create_func_difference() {}
-  virtual ~Create_func_difference() {}
+  Create_func_difference() = default;
+  virtual ~Create_func_difference() = default;
 };
 
 
@@ -3518,8 +3516,8 @@ public:
   static Create_func_union s_singleton;
 
 protected:
-  Create_func_union() {}
-  virtual ~Create_func_union() {}
+  Create_func_union() = default;
+  virtual ~Create_func_union() = default;
 };
 
 
@@ -3535,8 +3533,8 @@ public:
   static Create_func_symdifference s_singleton;
 
 protected:
-  Create_func_symdifference() {}
-  virtual ~Create_func_symdifference() {}
+  Create_func_symdifference() = default;
+  virtual ~Create_func_symdifference() = default;
 };
 
 
@@ -3551,8 +3549,8 @@ public:
   static Create_func_buffer s_singleton;
 
 protected:
-  Create_func_buffer() {}
-  virtual ~Create_func_buffer() {}
+  Create_func_buffer() = default;
+  virtual ~Create_func_buffer() = default;
 };
 
 
@@ -3567,8 +3565,8 @@ public:
   static Create_func_isclosed s_singleton;
 
 protected:
-  Create_func_isclosed() {}
-  virtual ~Create_func_isclosed() {}
+  Create_func_isclosed() = default;
+  virtual ~Create_func_isclosed() = default;
 };
 
 
@@ -3583,8 +3581,8 @@ public:
   static Create_func_isring s_singleton;
 
 protected:
-  Create_func_isring() {}
-  virtual ~Create_func_isring() {}
+  Create_func_isring() = default;
+  virtual ~Create_func_isring() = default;
 };
 
 
@@ -3599,8 +3597,8 @@ public:
   static Create_func_isempty s_singleton;
 
 protected:
-  Create_func_isempty() {}
-  virtual ~Create_func_isempty() {}
+  Create_func_isempty() = default;
+  virtual ~Create_func_isempty() = default;
 };
 
 
@@ -3615,8 +3613,8 @@ public:
   static Create_func_issimple s_singleton;
 
 protected:
-  Create_func_issimple() {}
-  virtual ~Create_func_issimple() {}
+  Create_func_issimple() = default;
+  virtual ~Create_func_issimple() = default;
 };
 
 
@@ -3632,8 +3630,8 @@ public:
   static Create_func_numgeometries s_singleton;
 
 protected:
-  Create_func_numgeometries() {}
-  virtual ~Create_func_numgeometries() {}
+  Create_func_numgeometries() = default;
+  virtual ~Create_func_numgeometries() = default;
 };
 
 
@@ -3648,8 +3646,8 @@ public:
   static Create_func_numinteriorring s_singleton;
 
 protected:
-  Create_func_numinteriorring() {}
-  virtual ~Create_func_numinteriorring() {}
+  Create_func_numinteriorring() = default;
+  virtual ~Create_func_numinteriorring() = default;
 };
 
 
@@ -3664,8 +3662,8 @@ public:
   static Create_func_numpoints s_singleton;
 
 protected:
-  Create_func_numpoints() {}
-  virtual ~Create_func_numpoints() {}
+  Create_func_numpoints() = default;
+  virtual ~Create_func_numpoints() = default;
 };
 
 
@@ -3681,8 +3679,8 @@ public:
   static Create_func_mbr_overlaps s_singleton;
 
 protected:
-  Create_func_mbr_overlaps() {}
-  virtual ~Create_func_mbr_overlaps() {}
+  Create_func_mbr_overlaps() = default;
+  virtual ~Create_func_mbr_overlaps() = default;
 };
 
 
@@ -3698,8 +3696,8 @@ public:
   static Create_func_overlaps s_singleton;
 
 protected:
-  Create_func_overlaps() {}
-  virtual ~Create_func_overlaps() {}
+  Create_func_overlaps() = default;
+  virtual ~Create_func_overlaps() = default;
 };
 
 
@@ -3717,8 +3715,8 @@ public:
   static Create_func_pointn s_singleton;
 
 protected:
-  Create_func_pointn() {}
-  virtual ~Create_func_pointn() {}
+  Create_func_pointn() = default;
+  virtual ~Create_func_pointn() = default;
 };
 
 
@@ -3735,8 +3733,8 @@ public:
   static Create_func_srid s_singleton;
 
 protected:
-  Create_func_srid() {}
-  virtual ~Create_func_srid() {}
+  Create_func_srid() = default;
+  virtual ~Create_func_srid() = default;
 };
 
 
@@ -3752,8 +3750,8 @@ public:
   static Create_func_startpoint s_singleton;
 
 protected:
-  Create_func_startpoint() {}
-  virtual ~Create_func_startpoint() {}
+  Create_func_startpoint() = default;
+  virtual ~Create_func_startpoint() = default;
 };
 
 
@@ -3770,8 +3768,8 @@ public:
   static Create_func_touches s_singleton;
 
 protected:
-  Create_func_touches() {}
-  virtual ~Create_func_touches() {}
+  Create_func_touches() = default;
+  virtual ~Create_func_touches() = default;
 };
 
 
@@ -3787,8 +3785,8 @@ public:
   static Create_func_mbr_within s_singleton;
 
 protected:
-  Create_func_mbr_within() {}
-  virtual ~Create_func_mbr_within() {}
+  Create_func_mbr_within() = default;
+  virtual ~Create_func_mbr_within() = default;
 };
 
 
@@ -3804,8 +3802,8 @@ public:
   static Create_func_within s_singleton;
 
 protected:
-  Create_func_within() {}
-  virtual ~Create_func_within() {}
+  Create_func_within() = default;
+  virtual ~Create_func_within() = default;
 };
 
 
@@ -3820,8 +3818,8 @@ public:
   static Create_func_x s_singleton;
 
 protected:
-  Create_func_x() {}
-  virtual ~Create_func_x() {}
+  Create_func_x() = default;
+  virtual ~Create_func_x() = default;
 };
 
 
@@ -3836,8 +3834,8 @@ public:
   static Create_func_y s_singleton;
 
 protected:
-  Create_func_y() {}
-  virtual ~Create_func_y() {}
+  Create_func_y() = default;
+  virtual ~Create_func_y() = default;
 };