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

Post-merge fixes to make tests pass.

Browse Source
This commit is contained in:
mkindahl@dl145h.mysql.com 2008-01-13 22:13:17 +01:00
parent 0e31b77207
commit 07d38435ea
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result
View File

@ -105,10 +105,6 @@ Last_IO_Error
SELECT * FROM tinnodb ORDER BY a; SELECT * FROM tinnodb ORDER BY a;
a a
DROP TABLE tmyisam;
DROP TABLE tinnodb;
DROP TABLE tndb;
--- on master --- --- on master ---
DROP TABLE tmyisam; DROP TABLE tmyisam, tinnodb, tndb;
DROP TABLE tinnodb; DROP TABLE tmyisam, tinnodb, tndb;
DROP TABLE tndb;

4
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
View File

@ -122,12 +122,8 @@ SELECT * FROM tinnodb ORDER BY a;
# Clean up. We cannot do it on master and replicate over, because # Clean up. We cannot do it on master and replicate over, because
# master binlog is in a bad state after last test. So we do it both on # master binlog is in a bad state after last test. So we do it both on
# master and on slave. # master and on slave.
DROP TABLE tmyisam;
DROP TABLE tinnodb;
DROP TABLE tndb;
--echo --- on master --- --echo --- on master ---
connection master; connection master;
connection master;
DROP TABLE tmyisam, tinnodb, tndb; DROP TABLE tmyisam, tinnodb, tndb;
connection slave; connection slave;