Commit 8adce14f authored by unknown's avatar unknown
Browse files

Updated test cases for testing Cluster Replication using the rpl* test cases 


mysql-test/t/rpl_row_USER.test:
  Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_row_USER.result:
  Changed test to allow ndbcluster engine to be use
mysql-test/t/rpl_bit.test:
  Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_bit.result:
  Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_log_pos.result:
  Changed test to allow ndbcluster engine to be use
mysql-test/t/rpl_log_pos.test:
  Changed test to allow ndbcluster engine to be use
mysql-test/r/not_ndb_table.require:
  Needed a way to tell some test case to skip running it default-storage-engine was set to ndb
mysql-test/t/rpl_000015.test:
  Updated test case
mysql-test/r/rpl_000015.result:
  Updated test case
mysql-test/t/rpl_loaddata2.test:
  Updated test case
mysql-test/r/rpl_loaddata2.result:
  Updated test case
mysql-test/t/rpl_loadfile.test:
  Updated test case
mysql-test/r/rpl_loadfile.result:
  Updated test case
mysql-test/include/not_ndb_table.inc:
  added comment header.
mysql-test/t/rpl_foreign_key_innodb.test:
  Skip test when NDB is forced
mysql-test/t/rpl_optimize.test:
  Skip test when NDB is forced
mysql-test/t/rpl000005.test:
  updated test case
mysql-test/r/rpl000005.result:
  updated test case
mysql-test/t/rpl_user_variables.test:
  Test clean up for CRBR testing
mysql-test/r/rpl_user_variables.result:
  Test clean up for CRBR testing
mysql-test/r/rpl_timezone.result:
  Test clean up for CRBR testing
mysql-test/t/rpl_timezone.test:
  Test clean up for CRBR testing
parent e03ccf5b

mysql-test/include/not_ndb_table.inc

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#######################

# Author: JBM

# Date: 2006-01-17

# Purpose: To skip a test when default-storage-engine=ndb

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

-- require r/not_ndb_table.require

disable_query_log;

show variables like "table_type";

enable_query_log;

mysql-test/r/not_ndb_table.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

table_type	MyISAM

mysql-test/r/rpl000005.result

+2 −2
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ INSERT INTO t1 SET name='Andy', age=31; 
INSERT t1 SET name='Jacob', age=2;

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

ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;

select * from t1;

SELECT * FROM t1 ORDER BY id;

name	age	id

Andy	31	00000001

Jacob	2	00000002

Caleb	1	00000003

select * from t1;

SELECT * FROM t1 ORDER BY id;

name	age	id

Andy	31	00000001

Jacob	2	00000002

mysql-test/r/rpl_000015.result

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 
drop table if exists t1;

create table t1 (n int, PRIMARY KEY(n));

insert into t1 values (10),(45),(90);

select * from t1;

SELECT * FROM t1 ORDER BY n;

n

10

45

90

select * from t1;

SELECT * FROM t1 ORDER BY n;

n

10

45

mysql-test/r/rpl_bit.result

+24 −24
Original line number Diff line number Diff line
@@ -65,36 +65,36 @@ oSupp sSuppD GSuppDf VNotSupp x034 
5	5	3	2	1

5	5	3	2	1

5	5	3	2	1

SELECT hex(bit1) from test.t1;

SELECT hex(bit1) FROM test.t1 ORDER BY bit1;

hex(bit1)

3F

3F

0

2A

0

0

0

0

SELECT hex(bit2) from test.t1;

hex(bit2)

3E

0

2A

3F

3F

SELECT hex(bit2) from test.t1 ORDER BY bit2;

hex(bit2)

0

1

1

1

1

SELECT hex(bit3) from test.t1;

2A

3E

3F

SELECT hex(bit3) from test.t1 ORDER BY bit3;

hex(bit3)

35

24

15

0

1

1

1

1

15

24

35

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;

oSupp	sSuppD	GSuppDf	VNotSupp	x034

5	5	3	2	1
@@ -105,34 +105,34 @@ oSupp sSuppD GSuppDf VNotSupp x034 
5	5	3	2	1

5	5	3	2	1

5	5	3	2	1

SELECT hex(bit1) from test.t1;

SELECT hex(bit1) FROM test.t1 ORDER BY bit1;

hex(bit1)

3F

3F

0

2A

0

0

0

0

SELECT hex(bit2) from test.t1;

hex(bit2)

3E

0

2A

3F

3F

SELECT hex(bit2) from test.t1 ORDER BY bit2;

hex(bit2)

0

1

1

1

1

SELECT hex(bit3) from test.t1;

2A

3E

3F

SELECT hex(bit3) from test.t1 ORDER BY bit3;

hex(bit3)

35

24

15

0

1

1

1

1

15

24

35

DROP TABLE IF EXISTS test.t1;