diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
| commit | 99a433ed1cc2cebad93d6ece2b65691f2f49d3ea (patch) | |
| tree | e7fc16ab8fe9b4b9ff486d1adbc27ed84c72b923 /sql/sql_class.h | |
| parent | 0a1d9d0681fda7595c0d08038357b56cf3bea9eb (diff) | |
| parent | b2187662bcba12b66667bc0531727453b3b8a666 (diff) | |
| download | mariadb-git-99a433ed1cc2cebad93d6ece2b65691f2f49d3ea.tar.gz | |
Merge branch '10.6' into 10.7mariadb-10.7.4
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 f8985d2093d..a6f51d4b28f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5595,8 +5595,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 && |