Commit 606603db authored by Alfranio Correia's avatar Alfranio Correia

Post-fix merge 5-1 --> 5.1-rpl. Fixed mysqlcheck.test var directories.

parent 29e8163c
...@@ -82,7 +82,6 @@ create view v1 as select * from information_schema.routines; ...@@ -82,7 +82,6 @@ create view v1 as select * from information_schema.routines;
check table v1, information_schema.routines; check table v1, information_schema.routines;
drop view v1; drop view v1;
# #
# Bug#37527: mysqlcheck fails to report entire database # Bug#37527: mysqlcheck fails to report entire database
# when frm file corruption # when frm file corruption
...@@ -90,20 +89,21 @@ drop view v1; ...@@ -90,20 +89,21 @@ drop view v1;
CREATE TABLE t1(a INT); CREATE TABLE t1(a INT);
CREATE TABLE t2(a INT); CREATE TABLE t2(a INT);
# backup then null t1.frm # backup then null t1.frm
--copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak --copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/t1.frm.bak
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm --remove_file $MYSQLD_DATADIR/test/t1.frm
--write_file $MYSQLTEST_VARDIR/master-data/test/t1.frm --write_file $MYSQLD_DATADIR/test/t1.frm
EOF EOF
--exec $MYSQL_CHECK test --exec $MYSQL_CHECK test
# restore t1.frm # restore t1.frm
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm --remove_file $MYSQLD_DATADIR/test/t1.frm
--copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak $MYSQLTEST_VARDIR/master-data/test/t1.frm --copy_file $MYSQLD_DATADIR/test/t1.frm.bak $MYSQLD_DATADIR/test/t1.frm
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak --remove_file $MYSQLD_DATADIR/test/t1.frm.bak
DROP TABLE t1, t2; DROP TABLE t1, t2;
--echo End of 5.0 tests --echo End of 5.0 tests
# #
# Bug #30679: 5.1 name encoding not performed for views during upgrade # Bug #30679: 5.1 name encoding not performed for views during upgrade
# #
...@@ -117,3 +117,6 @@ show tables; ...@@ -117,3 +117,6 @@ show tables;
show tables; show tables;
drop view v1, `v-1`; drop view v1, `v-1`;
drop table t1; drop table t1;
--echo End of 5.1 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment