diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-10 14:48:07 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-10 14:48:07 -0500 |
| commit | 9e2e4f7dd21c0a86dbae94e1898030405f970c02 (patch) | |
| tree | 84c9de045e4e83993bcee59a7d4697050e72a9f6 /sql/item.cc | |
| parent | e609c1096430643d88e973af6d5e26d3e80ec2f7 (diff) | |
| parent | 19d61b1b81fdcfed3986f37e7677f6bcc7e7c6aa (diff) | |
| download | mariadb-git-9e2e4f7dd21c0a86dbae94e1898030405f970c02.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
mysql-test/r/default.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index f8a8b4a6272..8914593e9f0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5467,6 +5467,7 @@ 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(); |