diff options
| author | unknown <ramil@mysql.com> | 2005-07-15 16:27:59 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-07-15 16:27:59 +0500 |
| commit | 5549ed0915c40e707000aaf98331a18d6138f24e (patch) | |
| tree | d08ca393bedc90167e45ad26bc9461766efee0ae /sql | |
| parent | 8a422a14792af6d2681d83b5fdd078ea56b26531 (diff) | |
| parent | 0ec715a69e4347fb6a729dcbcfb8760cf7a5f945 (diff) | |
| download | mariadb-git-5549ed0915c40e707000aaf98331a18d6138f24e.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index bb035ce5d37..52f260e7b2d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8487,7 +8487,8 @@ create_field::create_field(Field *old_field,Field *orig_field) else interval=0; def=0; - if (!old_field->is_real_null() && ! (flags & BLOB_FLAG) && + if (!(flags & (NO_DEFAULT_VALUE_FLAG | BLOB_FLAG)) && + !old_field->is_real_null() && old_field->ptr && orig_field) { char buff[MAX_FIELD_WIDTH],*pos; |