diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
| commit | 5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf (patch) | |
| tree | 3c6e29d5a9d1f0a067dcdf4cca5b5747721aee89 /sql/rpl_utility.cc | |
| parent | aa4357f3944032ab95137d52342bc7673159fc64 (diff) | |
| parent | 0eb26fdfa83d2ddd5f3dc3f8cf6e372a55b4c270 (diff) | |
| download | mariadb-git-5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index 0675e9b51ad..e7d3ce6d073 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -518,9 +518,9 @@ bool is_conversion_ok(int order, Relay_log_info *rli) { DBUG_ENTER("is_conversion_ok"); bool allow_non_lossy= - bit_is_set(slave_type_conversions_options, SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY); + slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY; bool allow_lossy= - bit_is_set(slave_type_conversions_options, SLAVE_TYPE_CONVERSIONS_ALL_LOSSY); + slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_LOSSY; DBUG_PRINT("enter", ("order: %d, flags:%s%s", order, allow_non_lossy ? " ALL_NON_LOSSY" : "", |