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

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

25
mysql-test/extra/rpl_tests/rpl_insert_id.test
View File

@ -1,3 +1,6 @@
###########################################################
# 2006-02-01: By JBM: Added 1022, ORDER BY and PK for NDB
###########################################################
# See if queries that use both auto_increment and LAST_INSERT_ID()
# are replicated well
@ -7,16 +10,16 @@
#should work for both SBR and RBR
connection master;
create table t1(a int auto_increment, key(a));
create table t2(b int auto_increment, c int, key(b));
create table t1(a int auto_increment, PRIMARY key(a));
create table t2(b int auto_increment, c int, PRIMARY key(b));
insert into t1 values (1),(2),(3);
insert into t1 values (null);
insert into t2 values (null,last_insert_id());
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
select * from t2;
select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
connection master;
#check if multi-line inserts,
#which set last_insert_id to the first id inserted,
@ -44,18 +47,18 @@ connection master;
drop table t2;
drop table t1;
create table t1(a int auto_increment, key(a));
create table t2(b int auto_increment, c int, key(b));
create table t1(a int auto_increment, PRIMARY key(a));
create table t2(b int auto_increment, c int, PRIMARY key(b));
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
insert into t2 (c) select * from t1;
select * from t2;
insert into t2 (c) select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
save_master_pos;
connection slave;
sync_with_master;
select * from t1;
select * from t2;
select * from t1 ORDER BY a;
select * from t2 ORDER BY b;
connection master;
drop table t1;
drop table t2;
@ -71,7 +74,7 @@ connection master;
SET TIMESTAMP=1000000000;
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
--error 1062
--error 1022, 1062
INSERT INTO t1 VALUES (1),(1);
sync_slave_with_master;

4
mysql-test/extra/rpl_tests/rpl_row_001.test
View File

@ -5,7 +5,7 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 LIMIT 10;
SELECT * FROM t1 ORDER BY word LIMIT 10;
#
# Test slave with wrong password
@ -30,7 +30,7 @@ sleep 2;
CREATE TABLE t3(n INT);
INSERT INTO t3 VALUES(1),(2);
sync_slave_with_master;
SELECT * FROM t3;
SELECT * FROM t3 ORDER BY n;
SELECT SUM(LENGTH(word)) FROM t1;
connection master;
DROP TABLE t1,t3;