1 files changed, 6 insertions, 0 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc
index 15dc42441a8..d18600dd7de 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -2519,6 +2519,12 @@ int Gis_geometry_collection::store_shapes(Gcalc_shape_transporter *trn) const
   n_objects= uint4korr(data);
   data+= 4;
 
+  if (!n_objects)
+  {
+    trn->empty_shape();
+    return 0;
+  }
+
   if (trn->start_collection(n_objects))
     return 1;