More test case updates for using RPL with NDB as default engine

mysql-test/t/rpl_create_database.test:
  Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
  Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
  new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
  Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
  Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
  updated with order by
mysql-test/r/rpl_redirect.result:
  updated with order by
mysql-test/t/rpl_ndb_func003.test:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
  updated with order by
mysql-test/t/rpl_row_sp001.test:
  updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
  Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
  Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
  part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
  part of rpl_log.test check in
mysql-test/t/disabled.def:
  Updated with MySQL Bugs: #17158
This commit is contained in:
unknown 2006-02-07 00:18:10 +01:00
commit 32e3f46125
22 changed files with 400 additions and 64 deletions

View file

@ -28,52 +28,52 @@ UPDATE test.t2 set t ='NONE';
END CASE;
end//
INSERT INTO test.t2 VALUES(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW');
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 NEW
2 NEW
3 NEW
4 NEW
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 NEW
2 NEW
3 NEW
4 NEW
call test.p2(1);
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 Tex
2 Tex
3 Tex
4 Tex
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 Tex
2 Tex
3 Tex
4 Tex
call test.p2(2);
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 SQL
2 SQL
3 SQL
4 SQL
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 SQL
2 SQL
3 SQL
4 SQL
call test.p2(3);
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 NONE
2 NONE
3 NONE
4 NONE
select * from test.t2;
SELECT * FROM t2 ORDER BY a;
a t
1 NONE
2 NONE