diff --git a/sql/spatial.cc b/sql/spatial.cc
index ec6bfb307b953c0aeddb71230c447c9bcb521915..ab415d9af10abeca73ac5155c2083e789f8c6e67 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -19,7 +19,7 @@
 
 /***************************** Gis_class_info *******************************/
 
-Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_end]=
+Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_end+1]=
 {
   NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
diff --git a/sql/spatial.h b/sql/spatial.h
index 26396dd0f90c2bbf61c64f0e9bfd7f216c8c2b3c..213bbbf6323470600df97c720116a56e3013b302 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -251,7 +251,7 @@ class Geometry
   }
 
   bool envelope(String *result) const;
-  static Geometry::Class_info *ci_collection[Geometry::wkb_end];
+  static Geometry::Class_info *ci_collection[Geometry::wkb_end+1];
 
 protected:
   static Class_info *find_class(int type_id)