diff options
| author | unknown <hf@deer.(none)> | 2004-01-23 20:00:10 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-23 20:00:10 +0400 |
| commit | a6132c6f0a742d04f0c0252f83be8b356507c9a6 (patch) | |
| tree | 49de7fcd3c746734425c8deed43728660a8047dc /sql/table.cc | |
| parent | 2320323a344759567d702b257fb965646e6d8e7a (diff) | |
| parent | 87b3ca5fe0f66b0d7546b6175d8b1d50d6d3a838 (diff) | |
| download | mariadb-git-a6132c6f0a742d04f0c0252f83be8b356507c9a6.tar.gz | |
Conflicts resolved
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
include/mysqld_error.h:
merging
sql/share/english/errmsg.txt:
merging
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 { |