Skip to content

M
MariaDB
Commit 4ae74a81 authored by jmiller@mysql.com's avatar jmiller@mysql.com
Browse files
Options

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

parent 065f8066
Show whitespace changes
Inline Side-by-side
Showing with 440 additions and 128 deletions
mysql-test/extra/rpl_tests/rpl000006.test
View file @ 4ae74a81
###########################################################
# 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 # Test forced timestamp
# #
...@@ -5,7 +13,7 @@ ...@@ -5,7 +13,7 @@
# 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;
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'); insert into t1 ( a) values ('F');
select unix_timestamp(t) from t1; select unix_timestamp(t) from t1;
connection slave; connection slave;
......
mysql-test/t/rpl000005.test → mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
View file @ 4ae74a81
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
# Change Date: 2006-01-17 # Change Date: 2006-01-17
# Change: Added order by in select # 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; source include/master-slave.inc;
# #
...@@ -10,7 +14,7 @@ source include/master-slave.inc; ...@@ -10,7 +14,7 @@ source include/master-slave.inc;
# #
SHOW VARIABLES LIKE 'relay_log_space_limit'; 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 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;
......
mysql-test/r/rpl000004.result
View file @ 4ae74a81
...@@ -5,11 +5,11 @@ reset slave; ...@@ -5,11 +5,11 @@ 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; 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; 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; 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 t1 from master;
load table t2 from master; load table t2 from master;
load table t3 from master; load table t3 from master;
......
mysql-test/r/rpl000006.result
View file @ 4ae74a81
...@@ -5,7 +5,7 @@ reset slave; ...@@ -5,7 +5,7 @@ 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; 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'); insert into t1 ( a) values ('F');
select unix_timestamp(t) from t1; select unix_timestamp(t) from t1;
unix_timestamp(t) unix_timestamp(t)
......
mysql-test/r/rpl000009.result
View file @ 4ae74a81
...@@ -38,12 +38,12 @@ mysql ...@@ -38,12 +38,12 @@ mysql
mysqltest mysqltest
mysqltest2 mysqltest2
test test
create table mysqltest2.t1(n int, s char(20)); create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest2.t2(n int, s text); create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');
insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen');
create table mysqltest.t1(n int, s char(20)); create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest.t2(n int, s text); 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.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test');
insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'),
(13, 'thirteen test'); (13, 'thirteen test');
......
mysql-test/r/rpl_LD_INFILE.result
View file @ 4ae74a81
...@@ -4,118 +4,114 @@ reset master; ...@@ -4,118 +4,114 @@ 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;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a)); CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
DELETE FROM test.t1 WHERE a = 'abashed'; DELETE FROM test.t1 WHERE a = 'abashed';
DELETE FROM test.t1; DELETE FROM test.t1;
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a DESC;
a a
abase
abased
abasement
abasements
abases
abash
abashed
abashes
abashing
abasing
abate
abated
abatement
abatements
abater
abates
abating
Abba
abbe
abbey
abbeys
abbot
abbots
Abbott
abbreviate
abbreviated
abbreviates
abbreviating
abbreviation
abbreviations
Abby
abdomen
abdomens
abdominal
abduct
abducted
abduction
abductions
abductor
abductors
abducts
Abe
abed
Abel
Abelian
Abelson
Aberdeen
Abernathy
aberrant
aberration aberration
SELECT * FROM test.t1;
a
abase
abased
abasement
abasements
abases
abash
abashed
abashes
abashing
abasing
abate
abated
abatement
abatements
abater
abates
abating
Abba
abbe
abbey
abbeys
abbot
abbots
Abbott
abbreviate
abbreviated
abbreviates
abbreviating
abbreviation
abbreviations
Abby
abdomen
abdomens
abdominal
abduct
abducted
abduction
abductions
abductor
abductors
abducts
Abe
abed
Abel
Abelian
Abelson
Aberdeen
Abernathy
aberrant aberrant
Abernathy
Aberdeen
Abelson
Abelian
Abel
abed
Abe
abducts
abductors
abductor
abductions
abduction
abducted
abduct
abdominal
abdomens
abdomen
Abby
abbreviations
abbreviation
abbreviating
abbreviates
abbreviated
abbreviate
Abbott
abbots
abbot
abbeys
abbey
abbe
Abba
abating
abates
abater
abatements
abatement
abated
abate
abasing
abashing
abashes
abashed
abash
abases
abasements
abasement
abased
abase
SELECT * FROM test.t1 ORDER BY a DESC;
a
aberration aberration
DROP PROCEDURE IF EXISTS test.p1; aberrant
Warnings: Abernathy
Note 1305 PROCEDURE p1 does not exist Aberdeen
Abelson
Abelian
Abel
abed
Abe
abducts
abductors
abductor
abductions
abduction
abducted
abduct
abdominal
abdomens
abdomen
Abby
abbreviations
abbreviation
abbreviating
abbreviates
abbreviated
abbreviate
Abbott
abbots
abbot
abbeys
abbey
abbe
Abba
abating
abates
abater
abatements
abatement
abated
abate
abasing
abashing
abashes
abashed
abash
abases
abasements
abasement
abased
abase
DROP TABLE test.t1; DROP TABLE test.t1;
mysql-test/r/rpl_ndb_auto_inc.result 0 → 100644
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;
create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3;
insert into t1 values (NULL,1),(NULL,2),(NULL,3);
select * from t1;
a b
12 1
22 2
32 3
select * from t1;
a b
12 1
22 2
32 3
drop table t1;
create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam;
insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4);
delete from t1 where b=4;
insert into t1 values (NULL,5),(NULL,6);
select * from t1;
a b
1 1
2 2
3 3
22 5
32 6
select * from t1;
a b
1 1
2 2
3 3
22 5
32 6
drop table t1;
set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10;
show variables like "%auto_inc%";
Variable_name Value
auto_increment_increment 100
auto_increment_offset 10
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
insert into t1 values (NULL),(5),(NULL);
insert into t1 values (250),(NULL);
select * from t1;
a
5
10
110
250
310
insert into t1 values (1000);
set @@insert_id=400;
insert into t1 values(NULL),(NULL);
select * from t1;
a
5
10
110
250
310
400
410
1000
select * from t1;
a
5
10
110
250
310
400
410
1000
drop table t1;
create table t1 (a int not null auto_increment, primary key (a)) engine=innodb;
insert into t1 values (NULL),(5),(NULL);
insert into t1 values (250),(NULL);
select * from t1;
a
5
10
110
250
310
insert into t1 values (1000);
set @@insert_id=400;
insert into t1 values(NULL),(NULL);
select * from t1;
a
5
10
110
250
310
400
410
1000
select * from t1;
a
5
10
110
250
310
400
410
1000
drop table t1;
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
insert into t1 values (NULL),(5),(NULL),(NULL);
insert into t1 values (500),(NULL),(502),(NULL),(NULL);
select * from t1;
a
1
5
6
7
500
501
502
503
504
set @@insert_id=600;
insert into t1 values(600),(NULL),(NULL);
ERROR 23000: Duplicate entry '600' for key 1
set @@insert_id=600;
insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
select * from t1;
a
1
5
6
7
500
501
502
503
504
600
610
611
select * from t1;
a
1
5
6
7
500
501
502
503
504
600
610
611
drop table t1;
set @@session.auto_increment_increment=10, @@session.auto_increment_offset=1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
insert into t1 values(2),(12),(22),(32),(42);
insert into t1 values (NULL),(NULL);
insert into t1 values (3),(NULL),(NULL);
select * from t1;
a
1
3
11
21
31
select * from t1;
a
1
2
3
11
12
21
22
31
32
42
drop table t1;
mysql-test/r/rpl_ndb_relay_space.result 0 → 100644
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=NDB;
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
Caleb 1 00000002
Jacob 2 00000003
SELECT * FROM t1 ORDER BY id;
name age id
Andy 31 00000001
Caleb 1 00000002
Jacob 2 00000003
drop table t1;
mysql-test/r/rpl_relay_space_innodb.result 0 → 100644
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=InnoDB;
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/r/rpl_relay_space_ndb.result 0 → 100644
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 @ 4ae74a81
...@@ -25,7 +25,6 @@ partition_03ndb : Bug#16385 ...@@ -25,7 +25,6 @@ partition_03ndb : Bug#16385
ndb_binlog_basic : Results are not deterministic, Tomas will fix ndb_binlog_basic : Results are not deterministic, Tomas will fix
rpl_ndb_basic : Bug#16228 rpl_ndb_basic : Bug#16228
rpl_sp : Bug #16456 rpl_sp : Bug #16456
#ndb_dd_disk2memory : Bug #16466
ndb_autodiscover : Needs to be fixed w.r.t binlog ndb_autodiscover : Needs to be fixed w.r.t binlog
ndb_autodiscover2 : Needs to be fixed w.r.t binlog ndb_autodiscover2 : Needs to be fixed w.r.t binlog
ndb_blob : BLOB replication causes core in master1 (Pekka will fix) ndb_blob : BLOB replication causes core in master1 (Pekka will fix)
...@@ -33,5 +32,6 @@ system_mysql_db : Needs fixing ...@@ -33,5 +32,6 @@ 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
# vim: set filetype=conf: # vim: set filetype=conf:
mysql-test/t/rpl000004.test
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; source include/master-slave.inc;
set SQL_LOG_BIN=0; 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; 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; 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;
connection slave; connection slave;
load table t1 from master; load table t1 from master;
load table t2 from master; load table t2 from master;
......
mysql-test/t/rpl000009.test
View file @ 4ae74a81
# This one assumes we are ignoring updates on tables in database mysqltest2, # This one assumes we are ignoring updates on tables in database mysqltest2,
# but doing the ones in database mysqltest # but doing the ones in database mysqltest
#################################################################
# Change Author: JBM
# Change Date: 2006-02-02
# Change: Added ENGINE=MyISAM
# Reason: NDB engine does not support sql_log_bin and the test is testing
# 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;
--disable_warnings --disable_warnings
...@@ -49,13 +58,13 @@ set sql_log_bin = 0; ...@@ -49,13 +58,13 @@ set sql_log_bin = 0;
create database mysqltest2; create database mysqltest2;
create database mysqltest; create database mysqltest;
show databases; show databases;
create table mysqltest2.t1(n int, s char(20)); create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest2.t2(n int, s text); create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');
insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen');
create table mysqltest.t1(n int, s char(20)); create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest.t2(n int, s text); 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.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test');
insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'),
(13, 'thirteen test'); (13, 'thirteen test');
......
mysql-test/t/rpl_LD_INFILE.test
View file @ 4ae74a81
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
# Begin clean up test section # Begin clean up test section
--disable_warnings --disable_warnings
connection master; connection master;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
--enable_warnings --enable_warnings
...@@ -23,18 +22,15 @@ DELETE FROM test.t1; ...@@ -23,18 +22,15 @@ DELETE FROM test.t1;
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
connection master; SELECT * FROM test.t1 ORDER BY a DESC;
SELECT * FROM test.t1;
save_master_pos; save_master_pos;
sync_slave_with_master; sync_slave_with_master;
connection slave; connection slave;
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a DESC;
connection master; connection master;
# Lets cleanup # Lets cleanup
#show binlog events; #show binlog events;
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
......
mysql-test/t/rpl_ndb_auto_inc-master.opt 0 → 100644
View file @ 4ae74a81
--auto-increment-increment=10 --auto-increment-offset=2
mysql-test/t/rpl_ndb_auto_inc.test 0 → 100644
View file @ 4ae74a81
#####################################
# Wrapper for rpl_auto_increment.test#
#####################################
-- source include/have_innodb.inc
let $engine_type=NDB;
let $engine_type2=myisam;
-- source extra/rpl_tests/rpl_auto_increment.test
mysql-test/t/rpl_ndb_relay_space.test 0 → 100644
View file @ 4ae74a81
##################################
# Wrapper rpl_sv_relay_space.test#
##################################
--source include/have_ndb.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_sv_relay_space.test
mysql-test/t/rpl_relay_space_innodb.test 0 → 100644
View file @ 4ae74a81
##################################
# Wrapper rpl_sv_relay_space.test#
##################################
-- source include/have_innodb.inc
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_sv_relay_space.test
mysql-test/t/rpl_relay_space_myisam.test 0 → 100644
View file @ 4ae74a81
##################################
# Wrapper rpl_sv_relay_space.test#
##################################
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_sv_relay_space.test
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