Skip to content

M
mariadb
Commit 43a9daf0 authored by jmiller@mysql.com's avatar jmiller@mysql.com
Browse files
Options

Implemented requested changes by Lars and did some general test cleanup. Lots more togo

parent 4ae74a81
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 125 deletions
mysql-test/r/rpl000004.a.result deleted 100644 → 0
View file @ 4ae74a81
Table Op Msg_type Msg_text
test.t1 check status OK
mysql-test/r/rpl000006.result deleted 100644 → 0
View file @ 4ae74a81
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
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))ENGINE=MyISAM;
insert into t1 ( a) values ('F');
select unix_timestamp(t) from t1;
unix_timestamp(t)
200006
load table t1 from master;
select unix_timestamp(t) from t1;
unix_timestamp(t)
200006
set SQL_LOG_BIN=1,timestamp=default;
drop table t1;
set SQL_LOG_BIN=0;
CREATE TABLE t1 (
a int not null
) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
INSERT INTO t1 VALUES (1);
load table t1 from master;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
drop table t1;
mysql-test/r/rpl000009.result → mysql-test/r/rpl_load_from_master.result
View file @ 43a9daf0
...@@ -13,11 +13,11 @@ drop database if exists mysqltest3; ...@@ -13,11 +13,11 @@ drop database if exists mysqltest3;
create database mysqltest2; create database mysqltest2;
create database mysqltest; create database mysqltest;
create database mysqltest2; create database mysqltest2;
create table mysqltest2.foo (n int); create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(4); insert into mysqltest2.foo values(4);
create table mysqltest2.foo (n int); create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(5); insert into mysqltest2.foo values(5);
create table mysqltest.bar (m int); create table mysqltest.bar (m int)ENGINE=MyISAM;
insert into mysqltest.bar values(15); insert into mysqltest.bar values(15);
select mysqltest2.foo.n,mysqltest.bar.m from mysqltest2.foo,mysqltest.bar; select mysqltest2.foo.n,mysqltest.bar.m from mysqltest2.foo,mysqltest.bar;
n m n m
...@@ -55,17 +55,17 @@ cluster_replication ...@@ -55,17 +55,17 @@ cluster_replication
mysql mysql
test test
create database mysqltest2; create database mysqltest2;
create table mysqltest2.t1(n int, s char(20)); create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'original foo.t1'); insert into mysqltest2.t1 values (1, 'original foo.t1');
create table mysqltest2.t3(n int, s char(20)); create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t3 values (1, 'original foo.t3'); insert into mysqltest2.t3 values (1, 'original foo.t3');
create database mysqltest3; create database mysqltest3;
create table mysqltest3.t1(n int, s char(20)); create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest3.t1 values (1, 'original foo2.t1'); insert into mysqltest3.t1 values (1, 'original foo2.t1');
create database mysqltest; create database mysqltest;
create table mysqltest.t1(n int, s char(20)); create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t1 values (1, 'original bar.t1'); insert into mysqltest.t1 values (1, 'original bar.t1');
create table mysqltest.t3(n int, s char(20)); create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t3 values (1, 'original bar.t3'); insert into mysqltest.t3 values (1, 'original bar.t3');
load data from master; load data from master;
show databases; show databases;
......
mysql-test/r/rpl000004.result → mysql-test/r/rpl_load_table_from_master.result
View file @ 43a9daf0
...@@ -4,6 +4,27 @@ reset master; ...@@ -4,6 +4,27 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
SET SQL_LOG_BIN=0,timestamp=200006;
CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM;
INSERT INTO t1 ( a) VALUE ('F');
select unix_timestamp(t) from t1;
unix_timestamp(t)
200006
load table t1 from master;
select unix_timestamp(t) from t1;
unix_timestamp(t)
200006
set SQL_LOG_BIN=1,timestamp=default;
drop table t1;
set SQL_LOG_BIN=0;
CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
INSERT INTO t1 VALUES (1);
load table t1 from master;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
drop table t1;
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1; load data infile '../../std_data/words.dat' into table t1;
......
mysql-test/r/rpl_relay_space_ndb.result deleted 100644 → 0
View file @ 4ae74a81
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
SHOW VARIABLES LIKE 'relay_log_space_limit';
Variable_name Value
relay_log_space_limit 0
CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=MyISAM;
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 ORDER BY id;
name age id
Andy 31 00000001
Jacob 2 00000002
Caleb 1 00000003
SELECT * FROM t1 ORDER BY id;
name age id
Andy 31 00000001
Jacob 2 00000002
Caleb 1 00000003
drop table t1;
mysql-test/t/disabled.def
View file @ 43a9daf0
...@@ -32,6 +32,7 @@ system_mysql_db : Needs fixing ...@@ -32,6 +32,7 @@ system_mysql_db : Needs fixing
system_mysql_db_fix : Needs fixing system_mysql_db_fix : Needs fixing
#ndb_alter_table_row : sometimes wrong error 1015!=1046 #ndb_alter_table_row : sometimes wrong error 1015!=1046
ndb_gis : garbled msgs from corrupt THD* ndb_gis : garbled msgs from corrupt THD*
rpl_ndb_auto_inc.test : MySQL Bugs:17086 rpl_ndb_auto_inc : MySQL Bugs:17086
rpl_ndb_relay_space : Results are not deterministic
# vim: set filetype=conf: # vim: set filetype=conf:
mysql-test/t/rpl000004.test deleted 100644 → 0
View file @ 4ae74a81
######################################
# Change Author: JBM
# Change Date: 2006-02-02
# Change: Added ENGINE=MyISAM
# Reason: LOAD FROM MASTER is only supported from
# MyISAM, therefore there is no reason for this test
# To use anyother Engine
######################################
source include/master-slave.inc;
set SQL_LOG_BIN=0;
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)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
connection slave;
load table t1 from master;
load table t2 from master;
load table t3 from master;
check table t1;
select count(*) from t2;
select count(*) from t3;
connection master;
set SQL_LOG_BIN=1;
drop table if exists t1,t2,t3;
save_master_pos;
connection slave;
sync_with_master;
create table t1(n int);
drop table t1;
# End of 4.1 tests
mysql-test/t/rpl000006.test deleted 100644 → 0
View file @ 4ae74a81
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl000006.test
mysql-test/t/rpl000009.test → mysql-test/t/rpl_load_from_master.test
View file @ 43a9daf0
...@@ -4,10 +4,7 @@ ...@@ -4,10 +4,7 @@
# Change Author: JBM # Change Author: JBM
# Change Date: 2006-02-02 # Change Date: 2006-02-02
# Change: Added ENGINE=MyISAM # Change: Added ENGINE=MyISAM
# Reason: NDB engine does not support sql_log_bin and the test is testing # Reason: LOAD from master is only supported by MyISAM
# Different replication features. It is better that the test not be
# skipped due to NDB being default engine so that NDB will be used for
# Some of the testing when default is set to NDB
################################################################# #################################################################
source include/master-slave.inc; source include/master-slave.inc;
...@@ -28,12 +25,12 @@ save_master_pos; ...@@ -28,12 +25,12 @@ save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
create database mysqltest2; create database mysqltest2;
create table mysqltest2.foo (n int); create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(4); insert into mysqltest2.foo values(4);
connection master; connection master;
create table mysqltest2.foo (n int); create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(5); insert into mysqltest2.foo values(5);
create table mysqltest.bar (m int); create table mysqltest.bar (m int)ENGINE=MyISAM;
insert into mysqltest.bar values(15); insert into mysqltest.bar values(15);
save_master_pos; save_master_pos;
connection slave; connection slave;
...@@ -78,21 +75,21 @@ show databases; ...@@ -78,21 +75,21 @@ show databases;
# Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM # Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM
# MASTER will neither touch database mysqltest nor mysqltest3 # MASTER will neither touch database mysqltest nor mysqltest3
create database mysqltest2; create database mysqltest2;
create table mysqltest2.t1(n int, s char(20)); create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'original foo.t1'); insert into mysqltest2.t1 values (1, 'original foo.t1');
create table mysqltest2.t3(n int, s char(20)); create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t3 values (1, 'original foo.t3'); insert into mysqltest2.t3 values (1, 'original foo.t3');
create database mysqltest3; create database mysqltest3;
create table mysqltest3.t1(n int, s char(20)); create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest3.t1 values (1, 'original foo2.t1'); insert into mysqltest3.t1 values (1, 'original foo2.t1');
# Create mysqltest, and mysqltest.t1, to check that it gets replaced, # Create mysqltest, and mysqltest.t1, to check that it gets replaced,
# and mysqltest.t3 to check that it is not touched (there is no # and mysqltest.t3 to check that it is not touched (there is no
# mysqltest.t3 on master) # mysqltest.t3 on master)
create database mysqltest; create database mysqltest;
create table mysqltest.t1(n int, s char(20)); create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t1 values (1, 'original bar.t1'); insert into mysqltest.t1 values (1, 'original bar.t1');
create table mysqltest.t3(n int, s char(20)); create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t3 values (1, 'original bar.t3'); insert into mysqltest.t3 values (1, 'original bar.t3');
load data from master; load data from master;
......
mysql-test/extra/rpl_tests/rpl000006.test → mysql-test/t/rpl_load_table_from_master.test
View file @ 43a9daf0
...@@ -6,15 +6,28 @@ ...@@ -6,15 +6,28 @@
# run test case for other engines, in addition test will # run test case for other engines, in addition test will
# fail if other engines are set as default engine # fail if other engines are set as default engine
########################################################### ###########################################################
# Change Author: JBM
# Change Date: 2006-2-3
# Change: removed ENGINE=$engine_type for first create table
# and renamed test file to rpl_load_table_from_master.test.
# In addition added test requirements.
# Reason: Request from review.
############################################################
# REQUIREMENT TEST 1:
# LOAD TABLE FROM MASTER must work with a forced timestamp.
#
# REQUIREMENTi TEST 2:
#LOAD TABLE FROM MASTER must work with table checksum
############################################################
# #
# Test forced timestamp # Test forced timestamp
# #
-- source include/master-slave.inc -- source include/master-slave.inc
# Don't log table creating to the slave as we want to test LOAD TABLE # Don't log table creating to the slave as we want to test LOAD TABLE
set SQL_LOG_BIN=0,timestamp=200006; SET SQL_LOG_BIN=0,timestamp=200006;
eval create table t1(t timestamp not null,a char(1))ENGINE=$engine_type; eval CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM;
insert into t1 ( a) values ('F'); INSERT INTO t1 ( a) VALUE ('F');
select unix_timestamp(t) from t1; select unix_timestamp(t) from t1;
connection slave; connection slave;
load table t1 from master; load table t1 from master;
...@@ -36,9 +49,7 @@ connection master; ...@@ -36,9 +49,7 @@ connection master;
# Don't log table creating to the slave as we want to test LOAD TABLE # Don't log table creating to the slave as we want to test LOAD TABLE
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
a int not null
) ENGINE=$engine_type MAX_ROWS=4000 CHECKSUM=1;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
save_master_pos; save_master_pos;
connection slave; connection slave;
...@@ -52,4 +63,31 @@ save_master_pos; ...@@ -52,4 +63,31 @@ save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
connection master;
set SQL_LOG_BIN=0;
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)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
connection slave;
load table t1 from master;
load table t2 from master;
load table t3 from master;
check table t1;
select count(*) from t2;
select count(*) from t3;
connection master;
set SQL_LOG_BIN=1;
drop table if exists t1,t2,t3;
save_master_pos;
connection slave;
sync_with_master;
create table t1(n int);
drop table t1;
# End of 4.1 tests # End of 4.1 tests
mysql-test/t/rpl_ndb_relay_space.test
View file @ 43a9daf0
################################## ###################################
# Wrapper rpl_sv_relay_space.test# # Wrapper rpl_sv_relay_space.test #
################################## # This test has to be wrapped as #
# It tests ndb, innodb and MyISAM.#
# By Wrapping we are saving some #
# space and making the test more #
# Maintainable by only having one #
# test file and reusing the code #
# In Addition, INNODB has to have #
# Option files during this test #
# to force innodb on the slave #
# else the test will fail #
###################################
#Change Author: JBM #
#Change Date: 2006-02-03 #
#Change: Added Comments #
###################################
--source include/have_ndb.inc --source include/have_ndb.inc
let $engine_type=NDB; let $engine_type=NDB;
-- source extra/rpl_tests/rpl_sv_relay_space.test -- source extra/rpl_tests/rpl_sv_relay_space.test
......
mysql-test/t/rpl_relay_space_innodb.test
View file @ 43a9daf0
################################## ###################################
# Wrapper rpl_sv_relay_space.test# # Wrapper rpl_sv_relay_space.test #
################################## # This test has to be wrapped as #
# It tests ndb, innodb and MyISAM.#
# By Wrapping we are saving some #
# space and making the test more #
# Maintainable by only having one #
# test file and reusing the code #
# In Addition, INNODB has to have #
# Option files during this test #
# to force innodb on the slave #
# else the test will fail #
###################################
#Change Author: JBM #
#Change Date: 2006-02-03 #
#Change: Added Comments #
###################################
-- source include/have_innodb.inc -- source include/have_innodb.inc
let $engine_type=InnoDB; let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_sv_relay_space.test -- source extra/rpl_tests/rpl_sv_relay_space.test
......
mysql-test/t/rpl_relay_space_myisam.test
View file @ 43a9daf0
################################## ###################################
# Wrapper rpl_sv_relay_space.test# # Wrapper rpl_sv_relay_space.test #
################################## # This test has to be wrapped as #
# It tests ndb, innodb and MyISAM.#
# By Wrapping we are saving some #
# space and making the test more #
# Maintainable by only having one #
# test file and reusing the code #
# In Addition, INNODB has to have #
# Option files during this test #
# to force innodb on the slave #
# else the test will fail #
###################################
#Change Author: JBM #
#Change Date: 2006-02-03 #
#Change: Added Comments #
###################################
let $engine_type=MyISAM; let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_sv_relay_space.test -- source extra/rpl_tests/rpl_sv_relay_space.test
mysql-test/t/rpl_000012.test → mysql-test/t/rpl_temp_table.test
View file @ 43a9daf0
# drop table t1 t2 t3 are included int master-slave.inc # drop table t1 t2 t3 are included int master-slave.inc
# Like rpl000013, meaningful only in statement-based: # meaningful only in statement-based:
-- source include/have_binlog_format_statement.inc -- source include/have_binlog_format_statement.inc
# Should work on both stm and row
-- source include/master-slave.inc -- source include/master-slave.inc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7