summaryrefslogtreecommitdiff
path: root/sql/sql_time.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-02-06 17:14:05 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-02-07 20:12:12 +0000
commitd995dd2865b4dd5d01175594ed667cfe8ce41712 (patch)
treec5072261dd3a00d47d72e4f085822a68d7ec3ee5 /sql/sql_time.cc
parent7bcf5e2907db6a8f1178aca967c8d326be3e5e22 (diff)
downloadmariadb-git-d995dd2865b4dd5d01175594ed667cfe8ce41712.tar.gz
Windows : reenable warning C4805 (unsafe mix of types in bool operations)
Diffstat (limited to 'sql/sql_time.cc')
-rw-r--r--sql/sql_time.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index 751a8926f33..95435c698f8 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -906,7 +906,7 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type,
{
long period, sign;
- sign= (interval.neg == ltime->neg ? 1 : -1);
+ sign= (interval.neg == (bool)ltime->neg ? 1 : -1);
switch (int_type) {
case INTERVAL_SECOND: