Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria

into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria


storage/maria/ma_loghandler.c:
  Auto merged

storage/maria/ma_loghandler.c

@@ -8325,7 +8325,7 @@ int main(int argc, char **argv)
   default_argv= argv;
   get_options(&argc, &argv);
 
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
 
   if ((handler= my_open(opt_file, O_RDONLY, MYF(MY_WME))) < 0)
   {

storage/maria/ma_test1.c

@@ -72,7 +72,7 @@ int main(int argc,char *argv[])
   MY_INIT(argv[0]);
   my_init();
   get_options(argc,argv);
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   /* Maria requires that we always have a page cache */
   if (maria_init() ||
       (init_pagecache(maria_pagecache, maria_block_size * 16, 0, 0,

storage/maria/ma_test2.c

@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
   if (! async_io)
     my_disable_async_io=1;
 
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   /* Maria requires that we always have a page cache */
   if (maria_init() ||
       (init_pagecache(maria_pagecache, pagecache_size, 0, 0,

storage/maria/maria_chk.c

@@ -97,7 +97,7 @@ int main(int argc, char **argv)
   int error;
   MY_INIT(argv[0]);
 
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   maria_chk_init(&check_param);
   check_param.opt_lock_memory= 1;		/* Lock memory if possible */
   check_param.using_global_keycache = 0;

storage/maria/unittest/ma_control_file-t.c

@@ -120,7 +120,7 @@ int main(int argc,char *argv[])
   MY_INIT(argv[0]);
   my_init();
 
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   default_error_handler_hook= error_handler_hook;
 
   plan(12);

storage/maria/unittest/ma_test_loghandler-t.c

@@ -154,7 +154,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   MY_INIT(argv[0]);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
 

storage/maria/unittest/ma_test_loghandler_first_lsn-t.c

@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   plan(2);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
   /* be sure that we have no logs in the directory*/

storage/maria/unittest/ma_test_loghandler_max_lsn-t.c

@@ -31,7 +31,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   plan(2);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
 

storage/maria/unittest/ma_test_loghandler_multigroup-t.c

@@ -141,7 +141,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   MY_INIT(argv[0]);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
 

storage/maria/unittest/ma_test_loghandler_multithread-t.c

@@ -207,7 +207,7 @@ int main(int argc __attribute__((unused)),
   plan(WRITERS + ITERATIONS * WRITERS * 3);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   long_buffer= malloc(LONG_BUFFER_SIZE + 7 * 2 + 2);
   if (long_buffer == 0)
   {

storage/maria/unittest/ma_test_loghandler_noflush-t.c

@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   plan(1);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
   /* be sure that we have no logs in the directory*/

storage/maria/unittest/ma_test_loghandler_nologs-t.c

@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
 
   bzero(&pagecache, sizeof(pagecache));
   bzero(long_buffer, LONG_BUFFER_SIZE);
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
 

storage/maria/unittest/ma_test_loghandler_pagecache-t.c

@@ -59,7 +59,7 @@ int main(int argc __attribute__((unused)), char *argv[])
   plan(1);
 
   bzero(&pagecache, sizeof(pagecache));
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);
   /* be sure that we have no logs in the directory*/

storage/maria/unittest/ma_test_loghandler_purge-t.c

@@ -34,7 +34,7 @@ int main(int argc __attribute__((unused)), char *argv[])
 
   bzero(&pagecache, sizeof(pagecache));
   bzero(long_buffer, LONG_BUFFER_SIZE);
-  maria_data_root= ".";
+  maria_data_root= (char *)".";
   if (maria_log_remove())
     exit(1);