diff options
| author | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
| commit | 4dc50758603d6ed2891412fdb6d37cd8b5541999 (patch) | |
| tree | c31def9d565271ff6ca10ec9c15433a12e91bba6 /storage/innobase/fil | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-4dc50758603d6ed2891412fdb6d37cd8b5541999.tar.gz | |
Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index ceffa950739..2db3063d6b5 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -474,7 +474,7 @@ fil_parse_write_crypt_data( 4 + // size of key_id 1; // fil_encryption_t - if (end_ptr - ptr < entry_size){ + if ((uint) (end_ptr - ptr) < entry_size){ return NULL; } @@ -500,7 +500,7 @@ fil_parse_write_crypt_data( fil_encryption_t encryption = (fil_encryption_t)mach_read_from_1(ptr); ptr +=1; - if (end_ptr - ptr < len) { + if ((uint) (end_ptr - ptr) < len) { return NULL; } @@ -1351,7 +1351,7 @@ fil_crypt_space_needs_rotation( last_scrub_completed; bool need_scrubbing = crypt_data->rotate_state.scrubbing.is_active - && diff >= srv_background_scrub_data_interval; + && diff >= (time_t) srv_background_scrub_data_interval; if (need_key_rotation == false && need_scrubbing == false) break; @@ -2247,7 +2247,7 @@ DECLARE_THREAD(fil_crypt_thread)( time_t waited = time(0) - wait_start; - if (waited >= srv_background_scrub_data_check_interval) { + if (waited >= (time_t) srv_background_scrub_data_check_interval) { break; } } |