database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Post-merge fix: restore promotion to unsigned long long side-effect of bit_is_set.

Browse Source
This commit is contained in:
Davi Arnaut
2010-07-03 09:28:27 -03:00
parent 93deacecb5
commit 7b449cd8e0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/rpl_utility.cc
View File

@ -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) bool is_conversion_ok(int order, Relay_log_info *rli)
{ {
DBUG_ENTER("is_conversion_ok"); DBUG_ENTER("is_conversion_ok");
bool allow_non_lossy= bool allow_non_lossy, allow_lossy;
slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY;
bool allow_lossy= allow_non_lossy = slave_type_conversions_options &
slave_type_conversions_options & SLAVE_TYPE_CONVERSIONS_ALL_LOSSY; (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, DBUG_PRINT("enter", ("order: %d, flags:%s%s", order,
allow_non_lossy ? " ALL_NON_LOSSY" : "", allow_non_lossy ? " ALL_NON_LOSSY" : "",