diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 17:14:05 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:12:12 +0000 |
| commit | d995dd2865b4dd5d01175594ed667cfe8ce41712 (patch) | |
| tree | c5072261dd3a00d47d72e4f085822a68d7ec3ee5 /plugin | |
| parent | 7bcf5e2907db6a8f1178aca967c8d326be3e5e22 (diff) | |
| download | mariadb-git-d995dd2865b4dd5d01175594ed667cfe8ce41712.tar.gz | |
Windows : reenable warning C4805 (unsafe mix of types in bool operations)
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index 0463a70a383..92f186a1e2a 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -40,7 +40,7 @@ ulong interval= 60*60*24*7; ///< in seconds (one week) */ static int table_to_string(TABLE *table, String *result) { - bool res; + int res; char buff1[MAX_FIELD_WIDTH], buff2[MAX_FIELD_WIDTH]; String str1(buff1, sizeof(buff1), system_charset_info); String str2(buff2, sizeof(buff2), system_charset_info); @@ -64,7 +64,7 @@ static int table_to_string(TABLE *table, String *result) } } - res = res || result->append('\n'); + res = res || (int)result->append('\n'); /* Note, "|=" and not "||" - because we want to call ha_rnd_end() |