diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:47:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 09:50:26 +0200 |
| commit | 7970ac7fe87d1da34e3e212dccd57b112b94b3fe (patch) | |
| tree | 4efda64ba55c4934469f61bda2013f92545dce1b /sql/sql_class.h | |
| parent | b03ab1270d24c1fe011aa50f9e6b495c6d508706 (diff) | |
| parent | 23ddc3518f999e003d54f7a069b63b73585588aa (diff) | |
| download | mariadb-git-7970ac7fe87d1da34e3e212dccd57b112b94b3fe.tar.gz | |
Merge branch '10.4' into 10.5mariadb-10.5.16
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5401d4e9b1f..3d1848a2db9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5332,8 +5332,8 @@ my_eof(THD *thd) inline date_conv_mode_t sql_mode_for_dates(THD *thd) { - static_assert((date_conv_mode_t::KNOWN_MODES & - time_round_mode_t::KNOWN_MODES) == 0, + static_assert((ulonglong(date_conv_mode_t::KNOWN_MODES) & + ulonglong(time_round_mode_t::KNOWN_MODES)) == 0, "date_conv_mode_t and time_round_mode_t must use different " "bit values"); static_assert(MODE_NO_ZERO_DATE == date_mode_t::NO_ZERO_DATE && |