1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Sergei Golubchik 2012-03-29 21:15:30 +02:00
commit fb3eb4a7e3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/maria/t/maria-autozerofill.test
View File

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

2
storage/maria/ha_maria.cc
View File

@ -1138,7 +1138,7 @@ int ha_maria::check(THD * thd, HA_CHECK_OPT * check_opt)
if ((file->s->state.changed & (STATE_CRASHED_FLAGS | STATE_MOVED)) == if ((file->s->state.changed & (STATE_CRASHED_FLAGS | STATE_MOVED)) ==
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; return HA_ADMIN_CORRUPT;
} }