Skip to content

M
mariadb
Commit 9b7ebb92 authored by unknown's avatar unknown
Browse files
Options

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"
parent 29a99fa0
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 28 deletions
include/mysqld_error.h
View file @ 9b7ebb92
......@@ -266,4 +266,5 @@
#define ER_SELECT_REDUCED 1247
#define ER_TABLENAME_NOT_ALLOWED_HERE 1248
#define ER_NOT_SUPPORTED_AUTH_MODE 1249
#define ER_ERROR_MESSAGES 250
#define ER_SPATIAL_CANT_HAVE_NULL 1250
#define ER_ERROR_MESSAGES 251
sql/share/czech/errmsg.txt
View file @ 9b7ebb92
......@@ -260,3 +260,4 @@ v/*
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/danish/errmsg.txt
View file @ 9b7ebb92
......@@ -254,3 +254,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/dutch/errmsg.txt
View file @ 9b7ebb92
......@@ -262,3 +262,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/english/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/estonian/errmsg.txt
View file @ 9b7ebb92
......@@ -256,3 +256,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/french/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/german/errmsg.txt
View file @ 9b7ebb92
......@@ -261,3 +261,4 @@
"Select %u wurde während der Optimierung reduziert.",
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/greek/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/hungarian/errmsg.txt
View file @ 9b7ebb92
......@@ -253,3 +253,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/italian/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/japanese/errmsg.txt
View file @ 9b7ebb92
......@@ -253,3 +253,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/korean/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian-ny/errmsg.txt
View file @ 9b7ebb92
......@@ -253,3 +253,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian/errmsg.txt
View file @ 9b7ebb92
......@@ -253,3 +253,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/polish/errmsg.txt
View file @ 9b7ebb92
......@@ -255,3 +255,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/portuguese/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/romanian/errmsg.txt
View file @ 9b7ebb92
......@@ -255,3 +255,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/russian/errmsg.txt
View file @ 9b7ebb92
......@@ -254,3 +254,4 @@
"Select %u ",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/serbian/errmsg.txt
View file @ 9b7ebb92
......@@ -247,3 +247,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/slovak/errmsg.txt
View file @ 9b7ebb92
......@@ -259,3 +259,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/spanish/errmsg.txt
View file @ 9b7ebb92
......@@ -252,3 +252,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/swedish/errmsg.txt
View file @ 9b7ebb92
......@@ -251,3 +251,4 @@
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/share/ukrainian/errmsg.txt
View file @ 9b7ebb92
......@@ -256,3 +256,4 @@
"Select %u was iii",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
sql/sql_table.cc
View file @ 9b7ebb92
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7