summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-08-07 21:30:46 +0000
committersergefp@mysql.com <>2005-08-07 21:30:46 +0000
commit0dba629a5ee2a4700d432e12622bcada42a4de8a (patch)
treedbcbb5a0eddba715a96d562797fc5f8adb73fe61 /sql/item_timefunc.h
parentd9ce6e8f2534e894ce7a92e18c9c154fdf201da9 (diff)
parentd820a09a6817ac6105b908393a78091cac62e525 (diff)
downloadmariadb-git-0dba629a5ee2a4700d432e12622bcada42a4de8a.tar.gz
Manual merge
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 107d12e6da2..e79bc25030b 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -714,6 +714,12 @@ public:
{
return (new Field_date(maybe_null, name, t_arg, &my_charset_bin));
}
+ void fix_length_and_dec()
+ {
+ collation.set(&my_charset_bin);
+ max_length= 10;
+ maybe_null= 1;
+ }
};