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

14 files changed, 14 insertions, 14 deletions

diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 768ce10ed13..9f36366a798 100644
--- a/storage/maria/ma_loghandler.c
+++ b/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)
   {
diff --git a/storage/maria/ma_test1.c b/storage/maria/ma_test1.c
index dbad1c8e11a..4ce2f6b2caf 100644
--- a/storage/maria/ma_test1.c
+++ b/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,
diff --git a/storage/maria/ma_test2.c b/storage/maria/ma_test2.c
index c57c2ba0999..aed7f2b8a04 100644
--- a/storage/maria/ma_test2.c
+++ b/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,
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c
index 35e9fd26700..423ba64b723 100644
--- a/storage/maria/maria_chk.c
+++ b/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;
diff --git a/storage/maria/unittest/ma_control_file-t.c b/storage/maria/unittest/ma_control_file-t.c
index 472748e491a..e990d01d4d0 100644
--- a/storage/maria/unittest/ma_control_file-t.c
+++ b/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);
diff --git a/storage/maria/unittest/ma_test_loghandler-t.c b/storage/maria/unittest/ma_test_loghandler-t.c
index 2bb21482fc3..0a1058f23dd 100644
--- a/storage/maria/unittest/ma_test_loghandler-t.c
+++ b/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);
 
diff --git a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
index 5b7b43e4775..fcf81f7a09a 100644
--- a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
+++ b/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*/
diff --git a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
index 114f56103a7..1133d553cf4 100644
--- a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
+++ b/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);
 
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 265826588ae..5a5312235ce 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/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);
 
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index a4e1e2da52c..44b69d52a42 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/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)
   {
diff --git a/storage/maria/unittest/ma_test_loghandler_noflush-t.c b/storage/maria/unittest/ma_test_loghandler_noflush-t.c
index 87a2221f7d6..92e453f7a4a 100644
--- a/storage/maria/unittest/ma_test_loghandler_noflush-t.c
+++ b/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*/
diff --git a/storage/maria/unittest/ma_test_loghandler_nologs-t.c b/storage/maria/unittest/ma_test_loghandler_nologs-t.c
index 071b5281b6a..6c819e69a88 100644
--- a/storage/maria/unittest/ma_test_loghandler_nologs-t.c
+++ b/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);
 
diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c
index 2b069b8c212..e42f6e1754a 100644
--- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c
+++ b/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*/
diff --git a/storage/maria/unittest/ma_test_loghandler_purge-t.c b/storage/maria/unittest/ma_test_loghandler_purge-t.c
index 8a537260c9b..446ecee1787 100644
--- a/storage/maria/unittest/ma_test_loghandler_purge-t.c
+++ b/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);