Commit 6345af6d 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


sql/mysql_priv.h:
  Auto merged
parents 4830c702 ec657e8d

mysql-test/r/rpl_drop_db.result

0 → 100644
+30 −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;

drop database if exists d1;

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);

drop database d1;

ERROR HY000: Error dropping database (can't rmdir './d1/', errno: 17)

use d1;

show tables;

Tables_in_d1

use test;

create table t1 (n int);

insert into t1 values (1234);

use d1;

show tables;

Tables_in_d1

use test;

select * from t1;

n

1234

drop table t1;

stop slave;

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
+39 −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;

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;

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, 
			 bool drop_temporary, bool log_query);

int mysql_rm_table_part2_with_lock(THD *thd, TABLE_LIST *tables,

				   bool if_exists, bool drop_temporary,

				   bool log_query);

				   bool log_query, List<String> *dropped_tables);

int quick_rm_table(enum db_type base,const char *db,

		   const char *table_name);

bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list);