Commit 9c5dbcc8 authored by unknown's avatar unknown
Browse files

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
parent f0263ac4

mysql-test/extra/rpl_tests/rpl000006.test

+9 −1
Original line number Diff line number Diff line 
###########################################################

# Change Author: JBM

# Change Date: 2006-2-2

# Change: Added ENGINE=$engine_type for first create table

# Reason: Only MyISAM supports load from master no need to

# run test case for other engines, in addition test will

# fail if other engines are set as default engine

###########################################################

#

# Test forced timestamp

#
@@ -5,7 +13,7 @@ 


# Don't log table creating to the slave as we want to test LOAD TABLE

set SQL_LOG_BIN=0,timestamp=200006;

create table t1(t timestamp not null,a char(1));

eval create table t1(t timestamp not null,a char(1))ENGINE=$engine_type;

insert into t1 ( a) values ('F');

select unix_timestamp(t) from t1;

connection slave;

mysql-test/t/rpl000005.test→mysql-test/extra/rpl_tests/rpl_sv_relay_space.test

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# Change Date: 2006-01-17

# Change: Added order by in select

####################

# Change Date: 2006-02-02

# Change: renamed to make bettre sense,

# and wrapped per Engine test

############################

source include/master-slave.inc;



#
@@ -10,7 +14,7 @@ source include/master-slave.inc; 
#

SHOW VARIABLES LIKE 'relay_log_space_limit';



CREATE TABLE t1 (name varchar(64), age smallint(3));

eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type;

INSERT INTO  t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

mysql-test/r/rpl000004.result

+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set SQL_LOG_BIN=0;

create table t1 (word char(20) not null, index(word));

create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;

load data infile '../../std_data/words.dat' into table t1;

create table t2 (word char(20) not null);

create table t2 (word char(20) not null)ENGINE=MyISAM;

load data infile '../../std_data/words.dat' into table t2;

create table t3 (word char(20) not null primary key);

create table t3 (word char(20) not null primary key)ENGINE=MyISAM;

load table t1 from master;

load table t2 from master;

load table t3 from master;

mysql-test/r/rpl000006.result

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set SQL_LOG_BIN=0,timestamp=200006;

create table t1(t timestamp not null,a char(1));

create table t1(t timestamp not null,a char(1))ENGINE=MyISAM;

insert into t1 ( a) values ('F');

select unix_timestamp(t) from t1;

unix_timestamp(t)

mysql-test/r/rpl000009.result

+4 −4
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ mysql 
mysqltest

mysqltest2

test

create table mysqltest2.t1(n int, s char(20));

create table mysqltest2.t2(n int, s text);

create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;

create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;

insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');

insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen');

create table mysqltest.t1(n int, s char(20));

create table mysqltest.t2(n int, s text);

create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;

create table mysqltest.t2(n int, s text)ENGINE=MyISAM;

insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test');

insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'),

(13, 'thirteen test');