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

Updated test

Browse Source
This commit is contained in:
jmiller@mysql.com
2006-01-20 23:28:52 +01:00
parent f07a80f7fb
commit 53784ff246
6 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_foreign_key.test
View File

@@ -21,7 +21,7 @@ connection master;
SET TIMESTAMP=1000000000; SET TIMESTAMP=1000000000;
CREATE TABLE t3 ( a INT UNIQUE ); CREATE TABLE t3 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
--error 1062 --error 1022, 1062
INSERT INTO t3 VALUES (1),(1); INSERT INTO t3 VALUES (1),(1);
sync_slave_with_master; sync_slave_with_master;

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

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

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

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

@@ -24,9 +24,9 @@ b c
6 11 6 11
SELECT * FROM t1; SELECT * FROM t1;
a a
12
10 10
11 11
12
13 13
SELECT * FROM t2; SELECT * FROM t2;
b c b c
@@ -36,7 +36,7 @@ SET TIMESTAMP=1000000000;
CREATE TABLE t3 ( a INT UNIQUE ); CREATE TABLE t3 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t3 VALUES (1),(1); INSERT INTO t3 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 1 Got one of the listed errors
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
DROP TABLE IF EXISTS t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3;
SET FOREIGN_KEY_CHECKS=1; SET FOREIGN_KEY_CHECKS=1;

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

@@ -5,7 +5,6 @@
# Change Date: 2006-01-17 # Change Date: 2006-01-17
# Change: FK not supported, skip test when NDB is forced # 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

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

@@ -4,10 +4,8 @@
##################################### #####################################
# Change Author: JBM # Change Author: JBM
# Change Date: 2006-01-17 # Change Date: 2006-01-17
# Change: Skip test when default table = ndb # Change:
##################################### #####################################
-- source include/not_ndb_table.inc
-- source include/master-slave.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));