diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:41:10 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:41:10 +0500 |
| commit | 6f168d12559d14b10fc3b9df7fec403af39bbc5a (patch) | |
| tree | 6a54e529a87637aaecb9e9ea0eaa44a985ecf02c /sql/field.h | |
| parent | d37e1642f2e3c235f72a4deac8fdbf6ed31afbfb (diff) | |
| parent | c0ebdff9c76c2b3e09bf5e44c22e68a35ef1affc (diff) | |
| download | mariadb-git-6f168d12559d14b10fc3b9df7fec403af39bbc5a.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
client/mysqltest.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/innodb_mysql.result:
merging
mysql-test/t/innodb_mysql.test:
merging
sql/sql_select.cc:
merging
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 46efb150205..fb6534b7b55 100644 --- a/sql/field.h +++ b/sql/field.h @@ -360,7 +360,12 @@ public: { return field_length / charset()->mbmaxlen; } - + virtual geometry_type get_geometry_type() + { + /* shouldn't get here. */ + DBUG_ASSERT(0); + return GEOM_GEOMETRY; + } friend bool reopen_table(THD *,struct st_table *,bool); friend int cre_myisam(my_string name, register TABLE *form, uint options, ulonglong auto_increment_value); @@ -1324,6 +1329,7 @@ public: uint get_key_image(char *buff,uint length,imagetype type); uint size_of() const { return sizeof(*this); } int reset(void) { return !maybe_null() || Field_blob::reset(); } + geometry_type get_geometry_type() { return geom_type; }; }; #endif /*HAVE_SPATIAL*/ |