Commit d05cdd25 authored by unknown's avatar unknown

Compiler warnings fixed.


storage/maria/ma_loghandler.c:
  Compiler warning fixed.
storage/maria/ma_test1.c:
  Compiler warning fixed.
storage/maria/ma_test2.c:
  Compiler warning fixed.
storage/maria/maria_chk.c:
  Compiler warning fixed.
storage/maria/unittest/ma_control_file-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_nologs-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
  Compiler warning fixed.
storage/maria/unittest/ma_test_loghandler_purge-t.c:
  Compiler warning fixed.
parent 04c6df9e
...@@ -8325,7 +8325,7 @@ int main(int argc, char **argv) ...@@ -8325,7 +8325,7 @@ int main(int argc, char **argv)
default_argv= argv; default_argv= argv;
get_options(&argc, &argv); get_options(&argc, &argv);
maria_data_root= "."; maria_data_root= (char *)".";
if ((handler= my_open(opt_file, O_RDONLY, MYF(MY_WME))) < 0) if ((handler= my_open(opt_file, O_RDONLY, MYF(MY_WME))) < 0)
{ {
......
...@@ -72,7 +72,7 @@ int main(int argc,char *argv[]) ...@@ -72,7 +72,7 @@ int main(int argc,char *argv[])
MY_INIT(argv[0]); MY_INIT(argv[0]);
my_init(); my_init();
get_options(argc,argv); get_options(argc,argv);
maria_data_root= "."; maria_data_root= (char *)".";
/* Maria requires that we always have a page cache */ /* Maria requires that we always have a page cache */
if (maria_init() || if (maria_init() ||
(init_pagecache(maria_pagecache, maria_block_size * 16, 0, 0, (init_pagecache(maria_pagecache, maria_block_size * 16, 0, 0,
......
...@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) ...@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
if (! async_io) if (! async_io)
my_disable_async_io=1; my_disable_async_io=1;
maria_data_root= "."; maria_data_root= (char *)".";
/* Maria requires that we always have a page cache */ /* Maria requires that we always have a page cache */
if (maria_init() || if (maria_init() ||
(init_pagecache(maria_pagecache, pagecache_size, 0, 0, (init_pagecache(maria_pagecache, pagecache_size, 0, 0,
......
...@@ -97,7 +97,7 @@ int main(int argc, char **argv) ...@@ -97,7 +97,7 @@ int main(int argc, char **argv)
int error; int error;
MY_INIT(argv[0]); MY_INIT(argv[0]);
maria_data_root= "."; maria_data_root= (char *)".";
maria_chk_init(&check_param); maria_chk_init(&check_param);
check_param.opt_lock_memory= 1; /* Lock memory if possible */ check_param.opt_lock_memory= 1; /* Lock memory if possible */
check_param.using_global_keycache = 0; check_param.using_global_keycache = 0;
......
...@@ -120,7 +120,7 @@ int main(int argc,char *argv[]) ...@@ -120,7 +120,7 @@ int main(int argc,char *argv[])
MY_INIT(argv[0]); MY_INIT(argv[0]);
my_init(); my_init();
maria_data_root= "."; maria_data_root= (char *)".";
default_error_handler_hook= error_handler_hook; default_error_handler_hook= error_handler_hook;
plan(12); plan(12);
......
...@@ -154,7 +154,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -154,7 +154,7 @@ int main(int argc __attribute__((unused)), char *argv[])
MY_INIT(argv[0]); MY_INIT(argv[0]);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
......
...@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[])
plan(2); plan(2);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
/* be sure that we have no logs in the directory*/ /* be sure that we have no logs in the directory*/
......
...@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[])
plan(2); plan(2);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
......
...@@ -141,7 +141,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -141,7 +141,7 @@ int main(int argc __attribute__((unused)), char *argv[])
MY_INIT(argv[0]); MY_INIT(argv[0]);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
......
...@@ -207,7 +207,7 @@ int main(int argc __attribute__((unused)), ...@@ -207,7 +207,7 @@ int main(int argc __attribute__((unused)),
plan(WRITERS + ITERATIONS * WRITERS * 3); plan(WRITERS + ITERATIONS * WRITERS * 3);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
long_buffer= malloc(LONG_BUFFER_SIZE + 7 * 2 + 2); long_buffer= malloc(LONG_BUFFER_SIZE + 7 * 2 + 2);
if (long_buffer == 0) if (long_buffer == 0)
{ {
......
...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
plan(1); plan(1);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
/* be sure that we have no logs in the directory*/ /* be sure that we have no logs in the directory*/
......
...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
bzero(long_buffer, LONG_BUFFER_SIZE); bzero(long_buffer, LONG_BUFFER_SIZE);
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
......
...@@ -59,7 +59,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -59,7 +59,7 @@ int main(int argc __attribute__((unused)), char *argv[])
plan(1); plan(1);
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
/* be sure that we have no logs in the directory*/ /* be sure that we have no logs in the directory*/
......
...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
bzero(&pagecache, sizeof(pagecache)); bzero(&pagecache, sizeof(pagecache));
bzero(long_buffer, LONG_BUFFER_SIZE); bzero(long_buffer, LONG_BUFFER_SIZE);
maria_data_root= "."; maria_data_root= (char *)".";
if (maria_log_remove()) if (maria_log_remove())
exit(1); exit(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment