database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-01-18 00:45:23 +01:00
parent e03ccf5bf4
commit 8adce14f70
22 changed files with 215 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/include/not_ndb_table.inc Normal file
View File

@ -0,0 +1,10 @@
#######################
# 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;

2
mysql-test/r/not_ndb_table.require Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
table_type MyISAM

4
mysql-test/r/rpl000005.result
View File

@ -12,12 +12,12 @@ INSERT INTO t1 SET name='Andy', age=31;
INSERT t1 SET name='Jacob', age=2; INSERT t1 SET name='Jacob', age=2;
INSERT into t1 SET name='Caleb', age=1; INSERT into t1 SET name='Caleb', age=1;
ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY; ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
select * from t1; SELECT * FROM t1 ORDER BY id;
name age id name age id
Andy 31 00000001 Andy 31 00000001
Jacob 2 00000002 Jacob 2 00000002
Caleb 1 00000003 Caleb 1 00000003
select * from t1; SELECT * FROM t1 ORDER BY id;
name age id name age id
Andy 31 00000001 Andy 31 00000001
Jacob 2 00000002 Jacob 2 00000002

4
mysql-test/r/rpl_000015.result
View File

@ -21,12 +21,12 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
drop table if exists t1; drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n)); create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90); insert into t1 values (10),(45),(90);
select * from t1; SELECT * FROM t1 ORDER BY n;
n n
10 10
45 45
90 90
select * from t1; SELECT * FROM t1 ORDER BY n;
n n
10 10
45 45

68
mysql-test/r/rpl_bit.result
View File

@ -65,36 +65,36 @@ oSupp sSuppD GSuppDf VNotSupp x034
5 5 3 2 1 5 5 3 2 1
5 5 3 2 1 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) hex(bit1)
0
0
0
0
0
2A
3F 3F
3F 3F
0 SELECT hex(bit2) from test.t1 ORDER BY bit2;
2A
0
0
0
0
SELECT hex(bit2) from test.t1;
hex(bit2) hex(bit2)
3E
0 0
1
1
1
1
2A 2A
3E
3F 3F
1 SELECT hex(bit3) from test.t1 ORDER BY bit3;
1
1
1
SELECT hex(bit3) from test.t1;
hex(bit3) hex(bit3)
35
24
15
0 0
1 1
1 1
1 1
1 1
15
24
35
SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1; SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;
oSupp sSuppD GSuppDf VNotSupp x034 oSupp sSuppD GSuppDf VNotSupp x034
5 5 3 2 1 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 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) hex(bit1)
0
0
0
0
0
2A
3F 3F
3F 3F
0 SELECT hex(bit2) from test.t1 ORDER BY bit2;
2A
0
0
0
0
SELECT hex(bit2) from test.t1;
hex(bit2) hex(bit2)
3E
0 0
1
1
1
1
2A 2A
3E
3F 3F
1 SELECT hex(bit3) from test.t1 ORDER BY bit3;
1
1
1
SELECT hex(bit3) from test.t1;
hex(bit3) hex(bit3)
35
24
15
0 0
1 1
1 1
1 1
1 1
15
24
35
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;

40
mysql-test/r/rpl_loaddata2.result
View File

@ -6,27 +6,27 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1; SELECT * FROM t1 ORDER BY word;
word word
Aarhus Aarhus
Aaron
Ababa
aback
abaft
abandon
abandoned
abandoning
abandonment
abandons
Aarhus Aarhus
Aaron Aaron
Aaron
Ababa
Ababa Ababa
aback aback
aback
abaft
abaft abaft
abandon abandon
abandon
abandoned
abandoned abandoned
abandoning abandoning
abandoning
abandonment abandonment
abandonment
abandons
abandons abandons
abase abase
abased abased
@ -78,27 +78,27 @@ Aberdeen
Abernathy Abernathy
aberrant aberrant
aberration aberration
SELECT * FROM t1; SELECT * FROM t1 ORDER BY word;
word word
Aarhus Aarhus
Aaron
Ababa
aback
abaft
abandon
abandoned
abandoning
abandonment
abandons
Aarhus Aarhus
Aaron Aaron
Aaron
Ababa
Ababa Ababa
aback aback
aback
abaft
abaft abaft
abandon abandon
abandon
abandoned
abandoned abandoned
abandoning abandoning
abandoning
abandonment abandonment
abandonment
abandons
abandons abandons
abase abase
abased abased

11
mysql-test/r/rpl_loadfile.result
View File

@ -15,7 +15,7 @@ INSERT INTO test.t1 VALUES(2,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2; UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2;
end| end|
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY blob_column;
a blob_column a blob_column
1 abase 1 abase
abased abased
@ -119,14 +119,7 @@ Abernathy
aberrant aberrant
aberration aberration
SHOW CREATE TABLE test.t1; SELECT * FROM test.t1 ORDER BY blob_column;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0',
`blob_column` longblob,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM test.t1;
a blob_column a blob_column
1 abase 1 abase
abased abased

2
mysql-test/r/rpl_log_pos.result
View File

@ -38,7 +38,7 @@ insert into t1 values (1),(2),(3);
stop slave; stop slave;
change master to master_log_pos=102; change master to master_log_pos=102;
start slave; start slave;
select * from t1; select * from t1 ORDER BY n;
n n
1 1
2 2

4
mysql-test/r/rpl_row_USER.result
View File

@ -19,13 +19,13 @@ INSERT INTO mysqltest1.t1 VALUES(3,USER());
INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER()); INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
end| end|
CALL mysqltest1.p1(); CALL mysqltest1.p1();
SELECT * FROM mysqltest1.t1; SELECT * FROM mysqltest1.t1 ORDER BY a;
a users a users
1 tester@localhost 1 tester@localhost
2 @localhost 2 @localhost
3 tester@localhost 3 tester@localhost
4 @localhost 4 @localhost
SELECT * FROM mysqltest1.t1; SELECT * FROM mysqltest1.t1 ORDER BY a;
a users a users
1 tester@localhost 1 tester@localhost
2 @localhost 2 @localhost

26
mysql-test/r/rpl_timezone.result
View File

@ -15,13 +15,13 @@ select @@time_zone;
Europe/Moscow Europe/Moscow
insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL); insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL);
insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
2005-01-01 00:00:00 1 2005-01-01 00:00:00 1
2005-06-11 09:39:02 2 2005-06-11 09:39:02 2
2004-01-01 00:00:00 3 2004-01-01 00:00:00 3
2004-06-11 09:39:02 4 2004-06-11 09:39:02 4
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
2005-01-01 06:00:00 1 2005-01-01 06:00:00 1
2005-06-11 14:39:02 2 2005-06-11 14:39:02 2
@ -30,12 +30,12 @@ t n
delete from t1; delete from t1;
set time_zone='Europe/Moscow'; set time_zone='Europe/Moscow';
insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
2004-01-01 00:00:00 5 2004-01-01 00:00:00 5
2004-06-11 09:39:02 6 2004-06-11 09:39:02 6
set time_zone='Europe/Moscow'; set time_zone='Europe/Moscow';
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
2004-01-01 00:00:00 5 2004-01-01 00:00:00 5
2004-06-11 09:39:02 6 2004-06-11 09:39:02 6
@ -47,12 +47,12 @@ Warning 1265 Data truncated for column 't' at row 1
Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 1 doesn't contain data for all columns
Warning 1265 Data truncated for column 't' at row 2 Warning 1265 Data truncated for column 't' at row 2
Warning 1261 Row 2 doesn't contain data for all columns Warning 1261 Row 2 doesn't contain data for all columns
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
0000-00-00 00:00:00 7 0000-00-00 00:00:00 7
0000-00-00 00:00:00 8 0000-00-00 00:00:00 8
set time_zone='UTC'; set time_zone='UTC';
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
0000-00-00 00:00:00 7 0000-00-00 00:00:00 7
0000-00-00 00:00:00 8 0000-00-00 00:00:00 8
@ -62,18 +62,18 @@ delete from t1;
insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
set time_zone='MET'; set time_zone='MET';
insert into t2 (select * from t1); insert into t2 (select * from t1);
select * from t1; SELECT * FROM t1 ORDER BY n;
t n t n
2003-12-31 22:00:00 9 2003-12-31 22:00:00 9
2004-06-11 07:39:02 10 2004-06-11 07:39:02 10
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2003-12-31 22:00:00 9 2003-12-31 22:00:00 9
2004-06-11 07:39:02 10 2004-06-11 07:39:02 10
delete from t2; delete from t2;
set timestamp=1000072000; set timestamp=1000072000;
insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL); insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL);
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2001-09-09 23:46:40 11 2001-09-09 23:46:40 11
2001-09-09 12 2001-09-09 12
@ -81,11 +81,11 @@ t n
delete from t2; delete from t2;
insert into t2 values (from_unixtime(1000000000),NULL), insert into t2 values (from_unixtime(1000000000),NULL),
(unix_timestamp('2001-09-09 03:46:40'),NULL); (unix_timestamp('2001-09-09 03:46:40'),NULL);
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2001-09-09 03:46:40 14 2001-09-09 03:46:40 14
1000000000 15 1000000000 15
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2001-09-09 03:46:40 14 2001-09-09 03:46:40 14
1000000000 15 1000000000 15
@ -94,11 +94,11 @@ delete from t2;
set time_zone='UTC'; set time_zone='UTC';
insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone),NULL); insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone),NULL);
insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'),NULL); insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'),NULL);
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2003-12-31 23:00:00 16 2003-12-31 23:00:00 16
2005-01-01 08:00:00 17 2005-01-01 08:00:00 17
select * from t2; SELECT * FROM t2 ORDER BY n;
t n t n
2003-12-31 23:00:00 16 2003-12-31 23:00:00 16
2005-01-01 08:00:00 17 2005-01-01 08:00:00 17

68
mysql-test/r/rpl_user_variables.result
View File

@ -24,59 +24,59 @@ insert into t1 values (@a),(@a);
select * from t1 where n = '<nonexistant>'; select * from t1 where n = '<nonexistant>';
n n
insert into t1 values (@a),(@a),(@a*5); insert into t1 values (@a),(@a),(@a*5);
select * from t1; SELECT * FROM t1 ORDER BY n;
n n
12345678901234 NULL
NULL
NULL
NULL
NULL
-1
-12.5
-12345678901234 -12345678901234
0 0
-1
12.5
-12.5
This is a test
abc'def
abc\def
abc'def
NULL
NULL
0 0
1 1
12.5
12345678901234
2 2
5 5
5
5
abc abc
abc'def
abc'def
abcn1 abcn1
abcn1n2 abcn1n2
5 abc\def
5 This is a test
NULL SELECT * FROM t1 ORDER BY n;
NULL
NULL
select * from t1;
n n
12345678901234 NULL
NULL
NULL
NULL
NULL
-1
-12.5
-12345678901234 -12345678901234
0 0
-1
12.5
-12.5
This is a test
abc'def
abc\def
abc'def
NULL
NULL
0 0
1 1
12.5
12345678901234
2 2
5 5
5
5
abc abc
abc'def
abc'def
abcn1 abcn1
abcn1n2 abcn1n2
5 abc\def
5 This is a test
NULL
NULL
NULL
drop table t1; drop table t1;
stop slave; stop slave;

9
mysql-test/t/rpl000005.test
View File

@ -1,3 +1,8 @@
####################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: Added order by in select
####################
source include/master-slave.inc; source include/master-slave.inc;
# #
@ -10,11 +15,11 @@ INSERT INTO t1 SET name='Andy', age=31;
INSERT t1 SET name='Jacob', age=2; INSERT t1 SET name='Jacob', age=2;
INSERT into t1 SET name='Caleb', age=1; INSERT into t1 SET name='Caleb', age=1;
ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY; ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
select * from t1; SELECT * FROM t1 ORDER BY id;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
select * from t1; SELECT * FROM t1 ORDER BY id;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; save_master_pos;

10
mysql-test/t/rpl_000015.test
View File

@ -1,3 +1,9 @@
#####################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: added order by in select
#####################
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
connection master; connection master;
@ -34,8 +40,8 @@ create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90); insert into t1 values (10),(45),(90);
sync_slave_with_master; sync_slave_with_master;
connection slave; connection slave;
select * from t1; SELECT * FROM t1 ORDER BY n;
connection master; connection master;
select * from t1; SELECT * FROM t1 ORDER BY n;
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;

16
mysql-test/t/rpl_bit.test
View File

@ -4,6 +4,10 @@
############################################################################# #############################################################################
# Test: To test the replication of the bit field # # Test: To test the replication of the bit field #
############################################################################# #############################################################################
# Change Author: JBM
# Change Date: 2006-01-16
# Change: Added Order by for NDB
##########
-- source include/master-slave.inc -- source include/master-slave.inc
@ -71,17 +75,17 @@ UNLOCK TABLES;
SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1; SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;
SELECT hex(bit1) from test.t1; SELECT hex(bit1) FROM test.t1 ORDER BY bit1;
SELECT hex(bit2) from test.t1; SELECT hex(bit2) from test.t1 ORDER BY bit2;
SELECT hex(bit3) from test.t1; SELECT hex(bit3) from test.t1 ORDER BY bit3;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1; SELECT oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;
SELECT hex(bit1) from test.t1; SELECT hex(bit1) FROM test.t1 ORDER BY bit1;
SELECT hex(bit2) from test.t1; SELECT hex(bit2) from test.t1 ORDER BY bit2;
SELECT hex(bit3) from test.t1; SELECT hex(bit3) from test.t1 ORDER BY bit3;
connection master; connection master;
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;

5
mysql-test/t/rpl_foreign_key_innodb.test
View File

@ -1,6 +1,11 @@
################################### ###################################
# Wrapper for rpl_foreign_key.test# # Wrapper for rpl_foreign_key.test#
################################### ###################################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: FK not supported, skip test when NDB is forced
####################################
-- source include/not_ndb_table.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
let $engine_type=INNODB; let $engine_type=INNODB;
-- source extra/rpl_tests/rpl_foreign_key.test -- source extra/rpl_tests/rpl_foreign_key.test

10
mysql-test/t/rpl_loaddata2.test
View File

@ -2,7 +2,13 @@
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1; SELECT * FROM t1 ORDER BY word;
sync_slave_with_master; sync_slave_with_master;
SELECT * FROM t1; SELECT * FROM t1 ORDER BY word;
##########
# Change Author: JBM
# Change Date: 2006-01-16
# Change: Added Order by for NDB
##########

14
mysql-test/t/rpl_loadfile.test
View File

@ -4,6 +4,10 @@
############################################################################# #############################################################################
# TEST: To test the LOAD_FILE() in rbr # # TEST: To test the LOAD_FILE() in rbr #
############################################################################# #############################################################################
# Change Author: JBM
# Change Date: 2006-01-16
# Change: Added Order by for NDB
##########
# Includes # Includes
-- source include/master-slave.inc -- source include/master-slave.inc
@ -30,18 +34,14 @@ end|
delimiter ;| delimiter ;|
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY blob_column;
save_master_pos; save_master_pos;
sync_slave_with_master; sync_slave_with_master;
connection slave; connection slave;
SHOW CREATE TABLE test.t1; SELECT * FROM test.t1 ORDER BY blob_column;
SELECT * FROM test.t1;
connection master;
# Lets cleanup # Lets cleanup
#show binlog events; connection master;
DROP PROCEDURE IF EXISTS test.p1; DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE test.t1; DROP TABLE test.t1;
# End of 5.0 test case # End of 5.0 test case

8
mysql-test/t/rpl_log_pos.test
View File

@ -1,3 +1,9 @@
##########
# Change Author: JBM
# Change Date: 2006-01-16
# Change: Added Order by for NDB
##########
# #
# Testing of setting slave to wrong log position with master_log_pos # Testing of setting slave to wrong log position with master_log_pos
# #
@ -46,7 +52,7 @@ stop slave;
change master to master_log_pos=102; change master to master_log_pos=102;
start slave; start slave;
sync_with_master; sync_with_master;
select * from t1; select * from t1 ORDER BY n;
connection master; connection master;
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;

8
mysql-test/t/rpl_optimize.test
View File

@ -1,8 +1,14 @@
# Test for BUG#1858 "OPTIMIZE TABLE done by a client # Test for BUG#1858 "OPTIMIZE TABLE done by a client
# thread stops the slave SQL thread". # thread stops the slave SQL thread".
# You can replace OPTIMIZE by REPAIR. # You can replace OPTIMIZE by REPAIR.
#####################################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: Skip test when default table = ndb
#####################################
source include/master-slave.inc; -- source include/not_ndb_table.inc
-- source include/master-slave.inc
create table t1 (a int not null auto_increment primary key, b int, key(b)); create table t1 (a int not null auto_increment primary key, b int, key(b));
INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

8
mysql-test/t/rpl_row_USER.test
View File

@ -4,6 +4,10 @@
############################################################################# #############################################################################
# TEST: To test the UUID() in rbr # # TEST: To test the UUID() in rbr #
############################################################################# #############################################################################
# Change Author: JBM
# Change Date: 2006-01-16
# Change: Added Order by for NDB
##########
# Includes # Includes
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_row.inc
@ -37,9 +41,9 @@ delimiter ;|
CALL mysqltest1.p1(); CALL mysqltest1.p1();
connection master; connection master;
SELECT * FROM mysqltest1.t1; SELECT * FROM mysqltest1.t1 ORDER BY a;
sync_slave_with_master; sync_slave_with_master;
SELECT * FROM mysqltest1.t1; SELECT * FROM mysqltest1.t1 ORDER BY a;
connection master; connection master;
# Lets cleanup # Lets cleanup

33
mysql-test/t/rpl_timezone.test
View File

@ -1,5 +1,10 @@
#######################################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: Added order by
#######################################
# Test of replication of time zones. # Test of replication of time zones.
######################################
# There is currently some bug possibly in prepared statements (this # There is currently some bug possibly in prepared statements (this
# test fails with --ps-protocol): sys_var_thd_time_zone::value_ptr() # test fails with --ps-protocol): sys_var_thd_time_zone::value_ptr()
# is called only at prepare time, not at execution time. So, # is called only at prepare time, not at execution time. So,
@ -32,10 +37,10 @@ select @@time_zone;
#select @@time_zone; #select @@time_zone;
insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL); insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL);
insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
select * from t1; SELECT * FROM t1 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
#set time_zone='UTC'; #set time_zone='UTC';
select * from t1; SELECT * FROM t1 ORDER BY n;
# Let us check also that setting of time_zone back to default also works # Let us check also that setting of time_zone back to default also works
# well # well
@ -43,10 +48,10 @@ connection master;
delete from t1; delete from t1;
set time_zone='Europe/Moscow'; set time_zone='Europe/Moscow';
insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
select * from t1; SELECT * FROM t1 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
set time_zone='Europe/Moscow'; set time_zone='Europe/Moscow';
select * from t1; SELECT * FROM t1 ORDER BY n;
connection master; connection master;
# Change Author: JBM # Change Author: JBM
# Change Date: 2005-12-22 # Change Date: 2005-12-22
@ -60,10 +65,10 @@ connection master;
delete from t1; delete from t1;
set time_zone='UTC'; set time_zone='UTC';
load data infile '../../std_data/rpl_timezone2.dat' into table t1; load data infile '../../std_data/rpl_timezone2.dat' into table t1;
select * from t1; SELECT * FROM t1 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
set time_zone='UTC'; set time_zone='UTC';
select * from t1; SELECT * FROM t1 ORDER BY n;
set time_zone='Europe/Moscow'; set time_zone='Europe/Moscow';
# Put back values of before the LOAD # Put back values of before the LOAD
@ -79,9 +84,9 @@ insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
# #
set time_zone='MET'; set time_zone='MET';
insert into t2 (select * from t1); insert into t2 (select * from t1);
select * from t1; SELECT * FROM t1 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
select * from t2; SELECT * FROM t2 ORDER BY n;
# #
# Now let us check how well we replicate various CURRENT_* functions # Now let us check how well we replicate various CURRENT_* functions
@ -91,7 +96,7 @@ delete from t2;
set timestamp=1000072000; set timestamp=1000072000;
insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL); insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL);
sync_slave_with_master; sync_slave_with_master;
select * from t2; SELECT * FROM t2 ORDER BY n;
# #
# At last let us check replication of FROM_UNIXTIME/UNIX_TIMESTAMP functions. # At last let us check replication of FROM_UNIXTIME/UNIX_TIMESTAMP functions.
@ -100,10 +105,10 @@ connection master;
delete from t2; delete from t2;
insert into t2 values (from_unixtime(1000000000),NULL), insert into t2 values (from_unixtime(1000000000),NULL),
(unix_timestamp('2001-09-09 03:46:40'),NULL); (unix_timestamp('2001-09-09 03:46:40'),NULL);
select * from t2; SELECT * FROM t2 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
# We should get same result on slave as on master # We should get same result on slave as on master
select * from t2; SELECT * FROM t2 ORDER BY n;
# #
# Let us check that we are allowing to set global time_zone with # Let us check that we are allowing to set global time_zone with
@ -119,9 +124,9 @@ delete from t2;
set time_zone='UTC'; set time_zone='UTC';
insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone),NULL); insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone),NULL);
insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'),NULL); insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'),NULL);
select * from t2; SELECT * FROM t2 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
select * from t2; SELECT * FROM t2 ORDER BY n;
# Clean up # Clean up
connection master; connection master;

11
mysql-test/t/rpl_user_variables.test
View File

@ -1,6 +1,13 @@
###################################
# Change Author: JBM
# Change Date: 2006-01-17
# Change: Added order by
###################################
# #
# Test of replicating user variables # Test of replicating user variables
# #
###################################
-- source include/master-slave.inc -- source include/master-slave.inc
# Disable PS as the log positions differs # Disable PS as the log positions differs
--disable_ps_protocol --disable_ps_protocol
@ -44,9 +51,9 @@ insert into t1 values (@a),(@a);
select * from t1 where n = '<nonexistant>'; select * from t1 where n = '<nonexistant>';
connection master1; # see if variable is reset in binlog when thread changes connection master1; # see if variable is reset in binlog when thread changes
insert into t1 values (@a),(@a),(@a*5); insert into t1 values (@a),(@a),(@a*5);
select * from t1; SELECT * FROM t1 ORDER BY n;
sync_slave_with_master; sync_slave_with_master;
select * from t1; SELECT * FROM t1 ORDER BY n;
connection master; connection master;
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;