Commit 786bb60c authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Updated
parents 95321f04 a9e979a9

mysql-test/extra/rpl_tests/rpl_loaddata_m.test

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# See if the master logs LOAD DATA INFILE correctly when binlog_*_db rules

# exist.

# This is for BUG#1100 (LOAD DATA INFILE was half-logged).





-- source include/master-slave.inc



--disable_warnings

drop database if exists mysqltest;

--enable_warnings



connection slave;

stop slave; # don't need slave for this test



# Test logging on master



connection master;

# 'test' is the current database

create database mysqltest;

use mysqltest;

create table t1(a int, b int, unique(b));

load data infile '../../std_data/rpl_loaddata.dat' into table t1;

# Starting from 5.0.3 LOAD DATA is replicated much in the same way as ordinary

# query so "show binlog ..." should show two events (before 5.0.3 no events

# were returned).

--replace_column 2 # 5 #

show binlog events from 102;

drop database mysqltest;

mysql-test/r/rpl_stm_err_ignoredtable.result→mysql-test/r/rpl_err_ignoredtable.result

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

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

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	292	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	292	#	None		0	No						#

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;

a

1

2

drop table t1;

select get_lock('crash_lock%20C', 10);

get_lock('crash_lock%20C', 10)
@@ -26,14 +32,11 @@ select (@id := id) - id from t3; 
0

kill @id;

drop table t2,t3;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int primary key)

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1),(1)

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a int primary key)

master-bin.000001	#	Query	1	#	use `test`; insert into t2 values(1)

master-bin.000001	#	Query	1	#	use `test`; create table t3 (id int)

master-bin.000001	#	Query	1	#	use `test`; insert into t3 values(connection_id())

master-bin.000001	#	Query	1	#	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)

master-bin.000001	#	Query	1	#	use `test`; drop table t2,t3
 
insert into t4 values (3),(4);

SELECT * FROM test.t4;

a

1

2

3

4

DROP TABLE test.t4;

mysql-test/r/rpl_loaddata_m.result

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

USE test;

CREATE TABLE t1(a INT, b INT, UNIQUE(b));

LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;

SELECT COUNT(*) FROM test.t1;

COUNT(*)

2

CREATE DATABASE mysqltest;

USE mysqltest;

CREATE TABLE t1(a INT, b INT, UNIQUE(b));

LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;

SELECT COUNT(*) FROM mysqltest.t1;

COUNT(*)

2

SHOW DATABASES;

Database

information_schema

mysql

mysqltest

test

USE test;

SHOW TABLES;

Tables_in_test

USE mysqltest;

SHOW TABLES;

Tables_in_mysqltest

t1

SELECT COUNT(*) FROM mysqltest.t1;

COUNT(*)

2

DROP DATABASE mysqltest;

DROP TABLE test.t1;