diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-10-18 15:57:59 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-10-18 15:57:59 +0300 |
| commit | 7f8c4aacf64abb02a61f13d4662a8516c6c4ddd2 (patch) | |
| tree | 7d1f9a5e5b05cf59a9222b38b35c7943168529ee /sql/item_timefunc.cc | |
| parent | 5f5b7cc3114443f3c69904d777a016a97ec3cf4e (diff) | |
| parent | abdc597b78aa05252d7a24123f14f8e9a6818b1d (diff) | |
| download | mariadb-git-7f8c4aacf64abb02a61f13d4662a8516c6c4ddd2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
into magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 59e1777f542..8240b7178c7 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1651,8 +1651,7 @@ bool Item_func_now::get_date(MYSQL_TIME *res, int Item_func_now::save_in_field(Field *to, bool no_conversions) { to->set_notnull(); - to->store_time(<ime, MYSQL_TIMESTAMP_DATETIME); - return 0; + return to->store_time(<ime, MYSQL_TIMESTAMP_DATETIME); } |