Commit fad7a4ba authored by unknown's avatar unknown
Browse files

Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
parents ad8c5c9d 4652c6b0

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1054,3 +1054,5 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

ndb/tools/ndb_config

support-files/MacOSX/postflight

support-files/MacOSX/preflight

mysql-test/r/rpl_drop_db.result

0 → 100644
+1035 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/rpl_insert_select.result

0 → 100644
+17 −0
Original line number Diff line number Diff line 
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 (n int not null primary key);

insert into t1 values (1);

create table t2 (n int);

insert into t2 values (1);

insert ignore into t1 select * from t2;

insert into t1 values (2);

select * from t1;

n

1

2

drop table t1,t2;

mysql-test/t/rpl_drop_db.test

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# test case for BUG#4680 -- if there are extra files in the db directory

# dropping the db on the master causes replication problems



-- source include/master-slave.inc

connection master;



--disable_warnings

drop database if exists d1;

--enable_warnings

create database d1;

create table d1.t1 (n int);

insert into d1.t1 values (1);

select * from d1.t1 into outfile 'd1/f1.txt';

create table d1.t2 (n int);

create table d1.t3 (n int);

--error 1010

drop database d1;

use d1;

show tables;



# test the branch of the code that deals with the query buffer overflow



let $1=1000;

while ($1)

{

  eval create table d1.t$1(n int);

  dec $1;

}

--error 1010

drop database d1;

use d1;

show tables;

use test;

create table t1 (n int);

insert into t1 values (1234);

sync_slave_with_master;



connection slave;

use d1;

show tables;

use test;

select * from t1;



connection master;

drop table t1;

sync_slave_with_master;



#cleanup

connection slave;

stop slave;

system rm -rf var/master-data/d1;

mysql-test/t/rpl_insert_select.test

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Testcase for BUG#10456 - INSERT INTO ... SELECT violating a primary key

# breaks replication



-- source include/master-slave.inc

connection master;



create table t1 (n int not null primary key);

insert into t1 values (1);

create table t2 (n int);

insert into t2 values (1);

insert ignore into t1 select * from t2;

insert into t1 values (2);

sync_slave_with_master;

connection slave;

select * from t1;



connection master;

drop table t1,t2;

sync_slave_with_master;