From 5a8da660a853047e6877e42631b1911bcf54b340 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 29 Mar 2012 16:36:06 +0200 Subject: [PATCH 1/2] make the code compile again --- storage/maria/ha_maria.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 6c0914ab751..ed554c4c24c 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -1088,7 +1088,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(¶m, zerofill_error_msg); + _ma_check_print_error(¶m, "%s", zerofill_error_msg); return HA_ADMIN_CORRUPT; } From bbf1a7961a37daa08e9818d381df1bca9e562bed Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 29 Mar 2012 18:06:08 +0200 Subject: [PATCH 2/2] fix the test case for windows: replace_result \\ / --- mysql-test/suite/maria/t/maria-autozerofill.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/suite/maria/t/maria-autozerofill.test b/mysql-test/suite/maria/t/maria-autozerofill.test index 637b7dafe92..1a9445ed9f0 100644 --- a/mysql-test/suite/maria/t/maria-autozerofill.test +++ b/mysql-test/suite/maria/t/maria-autozerofill.test @@ -54,6 +54,7 @@ EOF disable_ps_protocol; # see maria-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;