diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
| commit | 24516289237d5677f0624b1f37306ec505a6db8b (patch) | |
| tree | 100a7d06edd3f5c08cec39256f45661a0a0d27a7 /storage/maria/unittest | |
| parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
| download | mariadb-git-24516289237d5677f0624b1f37306ec505a6db8b.tar.gz | |
Fixed some simple warnings on Windows.
Diffstat (limited to 'storage/maria/unittest')
| -rw-r--r-- | storage/maria/unittest/ma_control_file-t.c | 4 | ||||
| -rw-r--r-- | storage/maria/unittest/ma_test_loghandler_multithread-t.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/maria/unittest/ma_control_file-t.c b/storage/maria/unittest/ma_control_file-t.c index 8533e461361..b4e757788c2 100644 --- a/storage/maria/unittest/ma_control_file-t.c +++ b/storage/maria/unittest/ma_control_file-t.c @@ -23,7 +23,9 @@ #include <my_global.h> #include <my_sys.h> #include <tap.h> - +#ifdef _WIN32 +#include <direct.h> /* rmdir */ +#endif #ifndef WITH_ARIA_STORAGE_ENGINE /* If Aria is not compiled in, normally we don't come to building this test. diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c index 5933059263a..18fbaeace5a 100644 --- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c +++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c @@ -289,7 +289,7 @@ int main(int argc __attribute__((unused)), fprintf(stderr, "End of memory\n"); exit(1); } - for (i= 0; i < (LONG_BUFFER_SIZE + 7 * 2 + 2); i++) + for (i= 0; i < (uint32)(LONG_BUFFER_SIZE + 7 * 2 + 2); i++) long_buffer[i]= (i & 0xFF); #ifndef DBUG_OFF |