Commit 84ca9122 authored by unknown's avatar unknown
Browse files

More rpl test updates with using ndb as default engine 


mysql-test/t/rpl_drop_temp.test:
  Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/r/rpl_drop_temp.result:
  Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/t/rpl_foreign_key_innodb-slave.opt:
  Need to ensure that innodb table is created on the slave for this test
mysql-test/t/rpl_err_ignoredtable.test:
  updated to run with ndb as default
mysql-test/r/rpl_err_ignoredtable.result:
  updated to run with ndb as default
mysql-test/t/disabled.def:
  Update requested by Lars
mysql-test/t/rpl_load_table_from_master.test:
  Update requested by Lars
mysql-test/r/rpl_load_table_from_master.result:
  Update requested by Lars
parent dbcc7753

mysql-test/r/rpl_drop_temp.result

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create database if not exists mysqltest;

create temporary table mysqltest.t1 (n int);

create temporary table mysqltest.t2 (n int);

create temporary table mysqltest.t1 (n int)ENGINE=MyISAM;

create temporary table mysqltest.t2 (n int)ENGINE=MyISAM;

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	0

mysql-test/r/rpl_err_ignoredtable.result

+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ start slave; 
create table t1 (a int primary key);

create table t4 (a int primary key);

insert into t1 values (1),(1);

ERROR 23000: Duplicate entry '1' for key 1

Got one of the listed errors

insert into t4 values (1),(2);

show tables like 't1';

Tables_in_test (t1)

show tables like 't4';

Tables_in_test (t4)

t4

SELECT * FROM test.t4;

SELECT * FROM test.t4 ORDER BY a;

a

1

2
@@ -33,7 +33,7 @@ select (@id := id) - id from t3; 
kill @id;

drop table t2,t3;

insert into t4 values (3),(4);

SELECT * FROM test.t4;

SELECT * FROM test.t4 ORDER BY a;

a

1

2

mysql-test/r/rpl_load_table_from_master.result

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

"******************** Test Requirment 1 *************"

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');
@@ -17,6 +18,7 @@ unix_timestamp(t) 
set SQL_LOG_BIN=1,timestamp=default;

drop table t1;

set SQL_LOG_BIN=0;

"******************** Test Requirment 2 *************"

CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;

INSERT INTO t1 VALUES (1);

load table t1 from master;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ ndb_autodiscover2 : Needs to be fixed w.r.t binlog 
#ndb_alter_table_row : sometimes wrong error 1015!=1046

ndb_gis : garbled msgs from corrupt THD*

rpl_ndb_auto_inc : MySQL Bugs:17086

rpl_ndb_relay_space : Results are not deterministic

rpl_ndb_relay_space : Bug 16993

ndb_binlog_ddl_multi : Bug #17038

rpl_ndb_log : MySQL Bugs: #17158

mysql-test/t/rpl_drop_temp.test

+9 −2
Original line number Diff line number Diff line 
##############################################

# Change Author: JBM

# Change Date: 2006-02-07

# Change: Added ENGINE=MyISAM

# Purpose: According to TU in 16552 This is how

# to work around NDB's issue with temp tables

##############################################

source include/master-slave.inc;

--disable_warnings

create database if not exists mysqltest;

--enable_warnings



create temporary table mysqltest.t1 (n int);

create temporary table mysqltest.t2 (n int);

create temporary table mysqltest.t1 (n int)ENGINE=MyISAM;

create temporary table mysqltest.t2 (n int)ENGINE=MyISAM;

sync_slave_with_master;

connection master;

disconnect master;