summaryrefslogtreecommitdiff
path: root/sql/events.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-22 09:20:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-22 09:46:51 +0300
commit70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch)
tree14d0c4dba49e36dc0d80c1ba99757b4074781d2d /sql/events.cc
parent7edadde72eb23e9110db8cea810c023104e9d15e (diff)
parent13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff)
downloadmariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/events.cc')
-rw-r--r--sql/events.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/events.cc b/sql/events.cc
index 2daf99abffc..ecba97649b7 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -1,5 +1,6 @@
/*
Copyright (c) 2005, 2013, Oracle and/or its affiliates.
+ Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -242,6 +243,7 @@ common_1_lev_code:
break;
case INTERVAL_WEEK:
expr/= 7;
+ /* fall through */
default:
close_quote= FALSE;
break;