diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-02-13 01:23:23 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-02-13 01:23:23 +0400 |
| commit | 4c2bc81ae762072973528e306c8fa80031b076b2 (patch) | |
| tree | 53beef330c2bd9116abb225d6c822813242fc034 /sql | |
| parent | e7e255061056571e5343fdad85ad121fd63817fb (diff) | |
| parent | 07f36668aecfd3d811c4ed5eb23b1bfdb8c86fdd (diff) | |
| download | mariadb-git-4c2bc81ae762072973528e306c8fa80031b076b2.tar.gz | |
Merge mysql.com:/home/hf/work/20691/my50-20691
into mysql.com:/home/hf/work/25492/my50-25492
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 95001809e9a..b4a7820eabf 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5495,6 +5495,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(); @@ -5513,7 +5520,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(); |