diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-02-14 00:58:54 +0100 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-02-14 00:58:54 +0100 |
| commit | 1e9a377323089d0569dd194a3c7ad75468e2e096 (patch) | |
| tree | 99ab757e4768129c86e211fd55ef78e78eb8e540 /sql | |
| parent | db1aa7e806bcb22aa47bf3f84f9328365ed2fd22 (diff) | |
| parent | 9292b57707fb0a2ccd6fb07a777a0f2089f8f6c5 (diff) | |
| download | mariadb-git-1e9a377323089d0569dd194a3c7ad75468e2e096.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
sql/item.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index b087ddb3abb..d0993ebabae 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5591,6 +5591,13 @@ int Item_default_value::save_in_field(Field *field_arg, bool no_conversions) { if (field_arg->flags & NO_DEFAULT_VALUE_FLAG) { + if (field_arg->reset()) + { + my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, + ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); + return -1; + } + if (context->error_processor == &view_error_processor) { TABLE_LIST *view= cached_table->top_table(); @@ -5609,7 +5616,6 @@ int Item_default_value::save_in_field(Field *field_arg, bool no_conversions) ER(ER_NO_DEFAULT_FOR_FIELD), field_arg->field_name); } - field_arg->set_default(); return 1; } field_arg->set_default(); |