diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
| commit | f22670c5a087bf9ec02962c8aeb99da79cbdea87 (patch) | |
| tree | 5718a5af3c09c59f20c1a2cca72da33e9c852e55 /sql/item_cmpfunc.cc | |
| parent | b2fd294d431480a96508e9caae6b920a51ca0f20 (diff) | |
| download | mariadb-git-f22670c5a087bf9ec02962c8aeb99da79cbdea87.tar.gz | |
Post-merge changes.
BitKeeper/deleted/.del-show_binlog_events2.inc:
Delete: mysql-test/include/show_binlog_events2.inc
client/mysqlbinlog.cc:
char -> uchar for raw memory.
sql/item_cmpfunc.cc:
Adding cast to remove warning when converting negative integer
to unsigned type.
sql/log_event.cc:
char -> uchar for raw memory.
sql/log_event.h:
char -> uchar for raw memory.
sql/rpl_utility.cc:
Adding cast to remove warning when converting negative integer
to unsigned type.
sql/slave.cc:
char -> uchar for raw memory.
sql/sql_repl.cc:
char -> uchar for raw memory.
sql-common/client.c:
char -> uchar for raw memory.
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 006846b147f..bca00b08f78 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -947,7 +947,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 |