summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2004-01-30 15:13:19 +0300
committerunknown <dlenev@mysql.com>2004-01-30 15:13:19 +0300
commita96ffb29258a80f8dfaa11f336d0edaa23ad6cf6 (patch)
treedb761ccd5b1911fe821d56d893c00a18741a4abe /sql/field.cc
parentc9f4333897e2eb9b5bacaf794ee3a65e43286606 (diff)
downloadmariadb-git-a96ffb29258a80f8dfaa11f336d0edaa23ad6cf6.tar.gz
Fix for bugs #1885, #2464, #2539. Proper handling of default
values for TIMESTAMP columns. The solution is not perfect since we just silently ignoring default value for first TIMESTAMP column and properly reflecting this fact in SHOW CREATE TABLE. We can't give a warning or simply support standard syntax (niladic functions as legal value for default) for first field since it is 4.0 tree. mysql-test/r/type_timestamp.result: Added test for bugs #1885, #2464, #2539 (proper support of default values for TIMESTAMP columns) mysql-test/t/type_timestamp.test: Added test for bugs #1885, #2464, #2539 (proper support of default values for TIMESTAMP columns) sql/field.cc: Enabled copying of defaults for TIMESTAMP fields when we are creating table with CREATE TABLE x (SELECT ...) sql/field.h: Set proper DEFAULT value for non-first TIMESTAMP column. sql/sql_parse.cc: Allowed default values for TIMESTAMP column. sql/sql_show.cc: Enabled printing of default values in SHOW CREATE TABLE and SHOW COLUMNS for all TIMESTAMP columns except first one.
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 8bcbf8ecc56..687c22bb69b 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5124,8 +5124,7 @@ create_field::create_field(Field *old_field,Field *orig_field)
interval=0;
def=0;
if (!old_field->is_real_null() && ! (flags & BLOB_FLAG) &&
- old_field->type() != FIELD_TYPE_TIMESTAMP && old_field->ptr &&
- orig_field)
+ old_field->ptr && orig_field)
{
char buff[MAX_FIELD_WIDTH],*pos;
String tmp(buff,sizeof(buff));