diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
| commit | b395490480dcf636a09a45f36733c32ec14b1772 (patch) | |
| tree | c9b1db7cfc763396ac45fed931a526ddf538698a /sql/item_cmpfunc.cc | |
| parent | 401628a18eebedaf7bdf95b0a25c09398e4c19d9 (diff) | |
| parent | 101c30ccc48d38c3ea98ebd89a350120a45aa591 (diff) | |
| download | mariadb-git-b395490480dcf636a09a45f36733c32ec14b1772.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-show_binlog_events2.inc:
Auto merged
sql-common/client.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.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 1d1e28593d4..208bdcedae9 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 -1; + return ~(ulonglong) -1; /* Convert strings to the integer DATE/DATETIME representation. Even if both dates provided in strings we can't compare them directly as |