merge

mysql-test/suite/maria/t/maria-autozerofill.test

@@ -54,6 +54,7 @@ EOF
 
 disable_ps_protocol; # see aria-recover.test
 replace_regex /Table.*t1/t1/ ;
+replace_result \\ /;
 select * from t1;
 enable_ps_protocol;
 flush table t1;
@@ -95,7 +96,9 @@ EOF
 check table t2;
 check table t2;
 repair table t2;
+replace_result \\ /;
 optimize table t3;
+replace_result \\ /;
 analyze table t4;
 
 drop database mysqltest;

storage/maria/ha_maria.cc

@@ -1187,7 +1187,7 @@ int ha_maria::check(THD * thd, HA_CHECK_OPT * check_opt)
   if ((file->s->state.changed & (STATE_CRASHED_FLAGS | STATE_MOVED)) ==
       STATE_MOVED)
   {
-    _ma_check_print_error(&param, zerofill_error_msg);
+    _ma_check_print_error(&param, "%s", zerofill_error_msg);
     return HA_ADMIN_CORRUPT;
   }