Reintroduce geometry support that was temporarily removed in r4.

handler/ha_innodb.cc

@@ -834,6 +834,7 @@ ha_innobase::ha_innobase(TABLE_SHARE *table_arg)
                   HA_CAN_SQL_HANDLER |
                   HA_NOT_EXACT_COUNT |
                   HA_PRIMARY_KEY_IN_READ_INDEX |
+                  HA_CAN_GEOMETRY |
                   HA_TABLE_SCAN_ON_INDEX),
   last_dup_key((uint) -1),
   start_of_scan(0),
@@ -2806,6 +2807,7 @@ get_innobase_type_from_mysql_type(
 					return(DATA_DOUBLE);
 		case FIELD_TYPE_DECIMAL:
 					return(DATA_DECIMAL);
+		case FIELD_TYPE_GEOMETRY:
 		case FIELD_TYPE_TINY_BLOB:
 		case FIELD_TYPE_MEDIUM_BLOB:
 		case FIELD_TYPE_BLOB:

mysql-test/innodb_gis.test

+source include/have_geometry.inc;
+-- source include/have_innodb.inc
+SET storage_engine=innodb;
+--source include/gis_generic.inc