diff options
| author | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
| commit | 70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e (patch) | |
| tree | 6c1605103b3513ebad088e2997385997cd4d354f /sql/item_timefunc.cc | |
| parent | ee380a077782f87d80aae7a8c9c9ead51dfd8e7b (diff) | |
| parent | 03ed0d1d244de2e97c1ca5749f1677d1dbb07f95 (diff) | |
| download | mariadb-git-70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e.tar.gz | |
Manually merged
client/mysqltest.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_select.h:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 7f847005966..2b0314bb287 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2504,6 +2504,7 @@ void Item_func_add_time::fix_length_and_dec() enum_field_types arg0_field_type; decimals=0; max_length=MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; + maybe_null= 1; /* The field type for the result of an Item_func_add_time function is defined |