summaryrefslogtreecommitdiff
path: root/sql/events.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-19 16:48:28 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-19 16:48:28 +0200
commit8d70097c216081e8013a548bfbde156e48985816 (patch)
tree4cca4f27d804ab261db2ee996f084fb5137833df /sql/events.cc
parent079c3599711b9cbd3ce323f32cf99693cc3d5e3b (diff)
parent252e690c859b53c51c7eecf072f33dbaaa01bcdf (diff)
downloadmariadb-git-8d70097c216081e8013a548bfbde156e48985816.tar.gz
Merge 10.1 to 10.2
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently return 0 on error
Diffstat (limited to 'sql/events.cc')
-rw-r--r--sql/events.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc
index 07cfdf1028a..b84c90a526c 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -420,7 +420,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data)
DBUG_RETURN(ret);
#ifdef WITH_WSREP
error:
- DBUG_RETURN(TRUE);
+ DBUG_RETURN(true);
#endif /* WITH_WSREP */
}