database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

More updates for using NDB as default and some bug fixes along the way

Browse Source 
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
  updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
  updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
  updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
  updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
  updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
  updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
  updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
  updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
  updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
  updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
  Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
  Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
  Updated results
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  update results file
This commit is contained in:
unknown
2006-02-08 13:08:19 +01:00
parent 642762bd3d
commit 68b51ff01c
17 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/rpl_row_blob_innodb-slave.opt Normal file
View File

@@ -0,0 +1 @@
--innodb

2
mysql-test/t/rpl_row_blob_innodb.test
View File

@@ -2,6 +2,6 @@
# Wrapper for rpl_row_blob.test#
#################################
-- source include/have_innodb.inc
let $engine_type=INNODB;
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_row_blob.test

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

@@ -37,12 +37,12 @@ delimiter ;|
INSERT INTO test.t1 VALUES (1, 'example.com'),(2, 'mysql.com'),(3, 'earthmotherwear.com'), (4, 'yahoo.com'),(5, 'example.com');
select * from test.t1;
SELECT * FROM test.t1 ORDER BY id;
#show binlog events;
save_master_pos;
connection slave;
sync_with_master;
select * from test.t1;
SELECT * FROM test.t1 ORDER BY id;
connection master;
INSERT INTO test.t3 VALUES ('Yes', 5, NULL, 'spamfilter','scan_incoming');
@@ -60,11 +60,13 @@ connection master;
DELETE FROM test.t1 WHERE id = 1;
select * from test.t1;
SELECT * FROM test.t1 ORDER BY id;
connection master;
SELECT * FROM test.t1 ORDER BY id;
save_master_pos;
connection slave;
sync_with_master;
select * from test.t1;
SELECT * FROM test.t1 ORDER BY id;
connection master;
#show binlog events;

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

@@ -1,3 +1,6 @@
##########################################
# 2006-02-07 By JBM: Added order by
#########################################
source include/master-slave.inc;
create table t1 (n int not null primary key);
@@ -11,6 +14,6 @@ insert into t1 values (2),(3);
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
select * from t1 ORDER BY n;
# End of 4.1 tests

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

@@ -1,3 +1,6 @@
#############################################################
# 2006-02-07 By JBM added order by
#############################################################
# test to see if replication can continue when master sporadically fails on
# COM_BINLOG_DUMP and additionally limits the number of events per dump
@@ -18,7 +21,7 @@ flush logs;
truncate table t1;
insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL);
sync_slave_with_master;
select * from t1;
select * from t1 ORDER BY n;
connection master;
drop table t1,t2;
sync_slave_with_master;

19
mysql-test/t/rpl_temporary.test
View File

@@ -1,3 +1,8 @@
#########################################################
# 2006-02-07 By JBM according to 16552 MyISAM should be used
# As work around for NDB using temp tables.
##########################################################
-- source include/master-slave.inc
# Clean up old slave's binlogs.
@@ -55,12 +60,12 @@ create table t2(f int);
insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
connection con1;
create temporary table t3(f int);
create temporary table t3(f int)ENGINE=MyISAM;
insert into t3 select * from t1 where f<6;
sleep 1;
connection con2;
create temporary table t3(f int);
create temporary table t3(f int)ENGINE=MyISAM;
sleep 1;
connection con1;
@@ -79,7 +84,7 @@ connection con2;
insert into t2 select count(*) from t3;
drop temporary table t3;
select * from t2;
select * from t2 ORDER BY f;
# Commented out 8/30/2005 to make compatable with both sbr and rbr
#--replace_result $VERSION VERSION
@@ -98,13 +103,13 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
SET TIMESTAMP=1040323945;
SET @@session.pseudo_thread_id=1;
create temporary table t3(f int);
create temporary table t3(f int)ENGINE=MyISAM;
SET TIMESTAMP=1040323952;
SET @@session.pseudo_thread_id=1;
insert into t3 select * from t1 where f<6;
SET TIMESTAMP=1040324145;
SET @@session.pseudo_thread_id=2;
create temporary table t3(f int);
create temporary table t3(f int)ENGINE=MyISAM;
SET TIMESTAMP=1040324186;
SET @@session.pseudo_thread_id=1;
insert into t2 select count(*) from t3;
@@ -121,13 +126,13 @@ SET TIMESTAMP=1040324224;
SET @@session.pseudo_thread_id=2;
drop temporary table t3;
select * from t2;
select * from t2 ORDER BY f;
drop table t1,t2;
# Create last a temporary table that is not dropped at end to ensure that we
# don't get any memory leaks for this
create temporary table t3 (f int);
create temporary table t3 (f int)ENGINE=MyISAM;
sync_with_master;
# The server will now close done