diff options
| author | unknown <dlenev@mysql.com> | 2004-01-30 15:13:54 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-01-30 15:13:54 +0300 |
| commit | e95a3e3ce8aa653c111c5c9ab28905750874dc60 (patch) | |
| tree | fddb781c70003995506ebea7f04fc28aa1224e55 /sql/sql_parse.cc | |
| parent | 8ab97bb111b75a66cfee409123a34da2647bcf99 (diff) | |
| parent | a96ffb29258a80f8dfaa11f336d0edaa23ad6cf6 (diff) | |
| download | mariadb-git-e95a3e3ce8aa653c111c5c9ab28905750874dc60.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg2464
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0d22704ef3c..189b2f73524 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3058,12 +3058,12 @@ bool add_field_to_list(char *field_name, enum_field_types type, if (default_value) { - 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) + /* + We allow specifying value for first TIMESTAMP column + altough it is silently ignored. This should be fixed in 4.1 + (by proper warning or real support for default values) + */ + if (default_value->type() == Item::NULL_ITEM) { default_value=0; if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) == |