summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-04-08 15:02:25 +0300
committerunknown <monty@mysql.com>2004-04-08 15:02:25 +0300
commit46bd7be2409e80b36de3cd0d49af33557ffa74a9 (patch)
tree88dba92be198f649f534fac8577c3cdc4a7af842 /sql/table.cc
parent94002eb59512e78df76922ae5c2204359fc306e4 (diff)
parent16845a71aa333bd43522a90652c87dcd953f9191 (diff)
downloadmariadb-git-46bd7be2409e80b36de3cd0d49af33557ffa74a9.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 sql/field.cc: Auto merged sql/field.h: Auto merged sql/handler.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index f137abf2ef7..1b7d30560ef 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -553,7 +553,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
keyinfo->key_length+= HA_KEY_NULL_LENGTH;
}
if (field->type() == FIELD_TYPE_BLOB ||
- field->type() == FIELD_TYPE_GEOMETRY ||
field->real_type() == FIELD_TYPE_VAR_STRING)
{
if (field->type() == FIELD_TYPE_BLOB)