From 9b7ebb928ca407c5a6ec19d89f7b95f43b601222 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Feb 2003 20:25:48 +0400 Subject: All segments of SPATIAL keys MUST be NOT NULL. Allow NULL geometry fields. include/mysqld_error.h: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/czech/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/danish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/dutch/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/english/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/estonian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/french/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/german/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/greek/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/hungarian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/italian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/japanese/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/korean/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/norwegian-ny/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/norwegian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/polish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/portuguese/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/romanian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/russian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/serbian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/slovak/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/spanish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/swedish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/ukrainian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" --- sql/sql_table.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sql/sql_table.cc') diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 699818b19fd..a8428d4f3da 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -478,11 +478,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, blob_columns++; break; case FIELD_TYPE_GEOMETRY: - if (!(sql_field->flags & NOT_NULL_FLAG)) - { - my_error(ER_BAD_NULL_ERROR, MYF(0), sql_field->field_name); - DBUG_RETURN(-1); - } sql_field->pack_flag=FIELDFLAG_GEOM | pack_length_to_packflag(sql_field->pack_length - portable_sizeof_char_ptr); @@ -741,6 +736,11 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, MYF(0),column->field_name); DBUG_RETURN(-1); } + if (key->type == Key::SPATIAL) + { + my_error(ER_SPATIAL_CANT_HAVE_NULL, MYF(0)); + DBUG_RETURN(-1); + } key_info->flags|= HA_NULL_PART_KEY; } if (MTYP_TYPENR(sql_field->unireg_check) == Field::NEXT_NUMBER) -- cgit v1.2.1