summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_table.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 80ddad3a4d2..a5e07379f59 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -478,6 +478,11 @@ 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);