Commit 34b101ca authored by ram@gw.mysql.r18.ru's avatar ram@gw.mysql.r18.ru

Fix for the bug #1885: mysqldump does not dumps timestamp default.

parent 56e49fd7
...@@ -3042,7 +3042,12 @@ bool add_field_to_list(char *field_name, enum_field_types type, ...@@ -3042,7 +3042,12 @@ bool add_field_to_list(char *field_name, enum_field_types type,
if (default_value) if (default_value)
{ {
if (default_value->type() == Item::NULL_ITEM) if (type == FIELD_TYPE_TIMESTAMP)
{
net_printf(&thd->net, ER_INVALID_DEFAULT, field_name);
DBUG_RETURN(1);
}
else if (default_value->type() == Item::NULL_ITEM)
{ {
default_value=0; default_value=0;
if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) == if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) ==
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment