diff options
| author | hf@deer.(none) <> | 2004-01-23 20:00:10 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2004-01-23 20:00:10 +0400 |
| commit | 52f2529536009624d669e453053e9f0d482cb8bb (patch) | |
| tree | 49de7fcd3c746734425c8deed43728660a8047dc /sql/table.cc | |
| parent | 0680d1659583981cac94e3765492e335fdaea14a (diff) | |
| parent | c13f757c4319b3831368adabfc11ace730f3014b (diff) | |
| download | mariadb-git-52f2529536009624d669e453053e9f0d482cb8bb.tar.gz | |
Conflicts resolved
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1127349db20..8fe061af530 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -405,8 +405,13 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, // charset and geometry_type share the same byte in frm if (field_type == FIELD_TYPE_GEOMETRY) { +#ifdef HAVE_SPATIAL geom_type= (Field::geometry_type) strpos[14]; charset= &my_charset_bin; +#else + error= 4; // unsupported field type + goto err_not_open; +#endif } else { |