diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-03 09:28:27 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-03 09:28:27 -0300 |
| commit | 7b449cd8e06e89b6a56e1898af8f9842c9e3670a (patch) | |
| tree | 374e097eaf01010733a013fa59d9ce1ce03a063f /sql | |
| parent | 93deacecb58b5771965c3bc44fce47a1a8bc519d (diff) | |
| download | mariadb-git-7b449cd8e06e89b6a56e1898af8f9842c9e3670a.tar.gz | |
Post-merge fix: restore promotion to unsigned long long side-effect of bit_is_set.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/rpl_utility.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index e7d3ce6d073..7479e58fd98 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -517,10 +517,12 @@ void show_sql_type(enum_field_types type, uint16 metadata, String *str, CHARSET_ bool is_conversion_ok(int order, Relay_log_info *rli) { DBUG_ENTER("is_conversion_ok"); - bool allow_non_lossy= - slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY; - bool allow_lossy= - slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_LOSSY; + bool allow_non_lossy, allow_lossy; + + allow_non_lossy = slave_type_conversions_options & + (ULL(1) << SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY); + allow_lossy= slave_type_conversions_options & + (ULL(1) << SLAVE_TYPE_CONVERSIONS_ALL_LOSSY); DBUG_PRINT("enter", ("order: %d, flags:%s%s", order, allow_non_lossy ? " ALL_NON_LOSSY" : "", |