First set of rpl test updated for NDB and general test cleanup

mysql-test/t/rpl000004.test:
  Updated test so it would not fail when MyISAM was not default Engine
mysql-test/r/rpl000004.result:
  Updated test so it would not fail when MyISAM was not default Engine
mysql-test/extra/rpl_tests/rpl000006.test:
  Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl000006.result:
  Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl_relay_space_myisam.result:
  Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning
mysql-test/t/rpl_relay_space_innodb-master.opt:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb-slave.opt:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb.test:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_myisam.test:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_ndb_relay_space.test:
  Wrapper for old test case called rpl000009.test
mysql-test/r/rpl_ndb_relay_space.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_innodb.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_ndb.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/t/rpl000009.test:
  updated to work when ndb is default engine
mysql-test/r/rpl000009.result:
  updated to work when ndb is default engine
mysql-test/t/rpl_LD_INFILE.test:
  Plan test cleanup
mysql-test/r/rpl_LD_INFILE.result:
  Plan test cleanup
mysql-test/t/rpl_auto_increment-slave.opt:
  needed to ensure test does not fail if default engine is specified
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Sorry, forgot to cleanup from debugging
mysql-test/t/rpl_ndb_auto_inc.test:
  New wrapper for NDB
mysql-test/t/rpl_ndb_auto_inc-master.opt:
  New wrapper for NDB
mysql-test/r/rpl_ndb_auto_inc.result:
  New wrapper for NDB
mysql-test/t/disabled.def:
  Updated

1 files changed, 2 insertions, 6 deletions

diff --git a/mysql-test/t/rpl_LD_INFILE.test b/mysql-test/t/rpl_LD_INFILE.test
index 769462b5898..06c14cf109c 100644
--- a/mysql-test/t/rpl_LD_INFILE.test
+++ b/mysql-test/t/rpl_LD_INFILE.test
@@ -11,7 +11,6 @@
 # Begin clean up test section
 --disable_warnings
 connection master;
-DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;
 --enable_warnings
 
@@ -23,18 +22,15 @@ DELETE FROM test.t1;
 LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
 
 
-connection master;
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a DESC;
 save_master_pos;
 sync_slave_with_master;
 connection slave;
-SELECT * FROM test.t1;
-
+SELECT * FROM test.t1 ORDER BY a DESC;
 connection master;
 # Lets cleanup
 #show binlog events;
 
-DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE test.t1;
 
 # End of 5.0 test case