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

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius 2012-03-30 13:51:16 +03:00
commit deaf220c50
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/maria/r/maria-autozerofill.result
View File

@ -10,6 +10,8 @@ create table t3 (a int) engine=aria;
INSERT INTO t3 VALUES (1),(2); INSERT INTO t3 VALUES (1),(2);
create table t4 (a int) engine=aria; create table t4 (a int) engine=aria;
INSERT INTO t4 VALUES (1),(2); INSERT INTO t4 VALUES (1),(2);
create table t5 (a int) engine=maria;
INSERT INTO t5 VALUES (1),(2);
flush tables; flush tables;
create_rename_lsn has non-magic value create_rename_lsn has non-magic value
* shut down mysqld, removed logs, restarted it * shut down mysqld, removed logs, restarted it
@ -34,6 +36,9 @@ mysqltest.t2 check error Corrupt
repair table t2; repair table t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
mysqltest.t2 repair status OK mysqltest.t2 repair status OK
check table t2;
Table Op Msg_type Msg_text
mysqltest.t2 check status OK
optimize table t3; optimize table t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
mysqltest.t3 optimize Note Zerofilling moved table ./mysqltest/t3 mysqltest.t3 optimize Note Zerofilling moved table ./mysqltest/t3
@ -42,4 +47,16 @@ analyze table t4;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
mysqltest.t4 analyze Note Zerofilling moved table ./mysqltest/t4 mysqltest.t4 analyze Note Zerofilling moved table ./mysqltest/t4
mysqltest.t4 analyze status OK mysqltest.t4 analyze status OK
repair table t5;
Table Op Msg_type Msg_text
mysqltest.t5 repair status OK
check table t5;
Table Op Msg_type Msg_text
mysqltest.t5 check status OK
repair table t5;
Table Op Msg_type Msg_text
mysqltest.t5 repair status OK
check table t5;
Table Op Msg_type Msg_text
mysqltest.t5 check status OK
drop database mysqltest; drop database mysqltest;

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

@ -31,6 +31,8 @@ create table t3 (a int) engine=aria;
INSERT INTO t3 VALUES (1),(2); INSERT INTO t3 VALUES (1),(2);
create table t4 (a int) engine=aria; create table t4 (a int) engine=aria;
INSERT INTO t4 VALUES (1),(2); INSERT INTO t4 VALUES (1),(2);
create table t5 (a int) engine=maria;
INSERT INTO t5 VALUES (1),(2);
flush tables; flush tables;
# Check that table is not zerofilled, not movable # Check that table is not zerofilled, not movable
@ -96,9 +98,14 @@ EOF
check table t2; check table t2;
check table t2; check table t2;
repair table t2; repair table t2;
check table t2;
replace_result \\ /; replace_result \\ /;
optimize table t3; optimize table t3;
replace_result \\ /; replace_result \\ /;
analyze table t4; analyze table t4;
repair table t5;
check table t5;
repair table t5;
check table t5;
drop database mysqltest; drop database mysqltest;

2
storage/maria/ha_maria.cc
View File

@ -1616,7 +1616,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
{ {
DBUG_PRINT("info", ("Reseting crashed state")); DBUG_PRINT("info", ("Reseting crashed state"));
share->state.changed&= ~(STATE_CHANGED | STATE_CRASHED_FLAGS | share->state.changed&= ~(STATE_CHANGED | STATE_CRASHED_FLAGS |
STATE_IN_REPAIR); STATE_IN_REPAIR | STATE_MOVED);
file->update |= HA_STATE_CHANGED | HA_STATE_ROW_CHANGED; file->update |= HA_STATE_CHANGED | HA_STATE_ROW_CHANGED;
} }
/* /*