diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2003-12-09 12:36:57 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2003-12-09 12:36:57 +0400 |
| commit | c167af11e95823ac1147612866e1f2b738bc5941 (patch) | |
| tree | 6d0b7042d41dc3c2660a58693ff011d6f0ff28e8 | |
| parent | 9a1cb59cd721a5a3a7e8a4ea1720fddc3d449892 (diff) | |
| download | mariadb-git-c167af11e95823ac1147612866e1f2b738bc5941.tar.gz | |
Fix for the bug #1885: mysqldump does not dumps timestamp default.
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c867112bb2a..fc9c21586d9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3042,7 +3042,12 @@ bool add_field_to_list(char *field_name, enum_field_types type, 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; if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) == |