diff options
| author | Sachin Setiya <sachinsetia1001@gmail.com> | 2017-11-03 12:34:05 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachinsetia1001@gmail.com> | 2017-11-03 12:34:05 +0530 |
| commit | 3cecb1bab381c256e43f0f095a7a02b115dfc7bc (patch) | |
| tree | a0793f42f4e1d9269dba2d08acb5a4a917470ab9 /sql/events.cc | |
| parent | 53b4185e5823d784c9f358ac01ec18c5bab7e208 (diff) | |
| parent | c3592ca7b8864a2492d98db4d45a7684e979301d (diff) | |
| download | mariadb-git-3cecb1bab381c256e43f0f095a7a02b115dfc7bc.tar.gz | |
Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/events.cc b/sql/events.cc index 0be9ce4e6f5..dd4e4887d50 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -188,8 +188,8 @@ common_1_lev_code: expr= tmp_expr - (tmp_expr/60)*60; /* the code after the switch will finish */ - } break; + } case INTERVAL_HOUR_SECOND: { ulonglong tmp_expr= expr; @@ -205,8 +205,8 @@ common_1_lev_code: expr= tmp_expr - (tmp_expr/60)*60; /* the code after the switch will finish */ - } break; + } case INTERVAL_DAY_SECOND: { ulonglong tmp_expr= expr; @@ -228,8 +228,8 @@ common_1_lev_code: expr= tmp_expr - (tmp_expr/60)*60; /* the code after the switch will finish */ - } break; + } case INTERVAL_DAY_MICROSECOND: case INTERVAL_HOUR_MICROSECOND: case INTERVAL_MINUTE_MICROSECOND: @@ -243,7 +243,8 @@ common_1_lev_code: break; case INTERVAL_WEEK: expr/= 7; - /* fall through */ + close_quote= FALSE; + break; default: close_quote= FALSE; break; |