diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 17:46:37 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 17:46:37 +0100 |
| commit | 7b8ec92ecc970c622d31df72bd502da231531222 (patch) | |
| tree | 22c2ea0759b0858b99e9240493c5d729ee9e21cb /sql/item_cmpfunc.cc | |
| parent | b395490480dcf636a09a45f36733c32ec14b1772 (diff) | |
| parent | b0283afb9c19033047d304eb0d31b29b971bf971 (diff) | |
| download | mariadb-git-7b8ec92ecc970c622d31df72bd502da231531222.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 208bdcedae9..5f77287e1dd 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -967,7 +967,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg, *is_null= item->null_value; } if (*is_null) - return ~(ulonglong) -1; + return ~(ulonglong) 0; /* Convert strings to the integer DATE/DATETIME representation. Even if both dates provided in strings we can't compare them directly as |