Commit 683c1e6a authored by unknown's avatar unknown
Browse files

After merge fix 


mysql-test/t/rpl_loaddata_simple.test:
  Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_simple.test
mysql-test/r/rpl_loaddata_simple.result:
  Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_simple.result
parent b9959b74

mysql-test/r/ctype_cp932_binlog_stm.result

+6 −6
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ HEX(s1) HEX(s2) d 
466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 397|

SHOW BINLOG EVENTS FROM 406|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	397	Query	1	560	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

master-bin.000001	406	Query	1	572	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))

master-bin.000001	560	Query	1	805	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

master-bin.000001	572	Query	1	820	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

IN ins2 CHAR(50) CHARACTER SET cp932,

IN ind DECIMAL(10,2))

BEGIN

INSERT INTO t4 VALUES (ins1, ins2, ind);

END

master-bin.000001	805	Query	1	1021	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1021	Query	1	1107	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1107	Query	1	1183	use `test`; DROP TABLE t4
 
master-bin.000001	820	Query	1	1039	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1039	Query	1	1128	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1128	Query	1	1207	use `test`; DROP TABLE t4

mysql-test/r/mysqlbinlog.result

+8 −7
Original line number Diff line number Diff line
@@ -308,26 +308,27 @@ SET @@session.sql_mode=0/*!*/; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

create table t1 (a varchar(64) character set utf8)/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-6-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-6-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=7/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-7-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-7-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=DEFAULT/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-8-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-8-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-9-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-9-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=7/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-a-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-a-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=DEFAULT/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-b-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-b-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/*!*/;

load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop table t1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

flush logs;

mysql-test/r/rpl_loaddata_simple.result

0 → 100644
+153 −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 (word CHAR(20) NOT NULL);

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;

SELECT * FROM t1 ORDER BY word;

word

Aarhus

Aarhus

Aaron

Aaron

Ababa

Ababa

aback

aback

abaft

abaft

abandon

abandon

abandoned

abandoned

abandoning

abandoning

abandonment

abandonment

abandons

abandons

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

SELECT * FROM t1 ORDER BY word;

word

Aarhus

Aarhus

Aaron

Aaron

Ababa

Ababa

aback

aback

abaft

abaft

abandon

abandon

abandoned

abandoned

abandoning

abandoning

abandonment

abandonment

abandons

abandons

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

drop table t1;

mysql-test/t/ctype_cp932_binlog_stm.test

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)| 
SELECT HEX(s1),HEX(s2),d FROM t4|

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 397|

SHOW BINLOG EVENTS FROM 406|

delimiter ;|



# End of 5.0 tests

mysql-test/t/mysqlbinlog.test

+4 −3
Original line number Diff line number Diff line
@@ -214,7 +214,8 @@ load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8 
select hex(a) from t1;

drop table t1;

flush logs;

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000011

--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000012



# End of 5.0 tests
@@ -223,7 +224,7 @@ flush logs; 
#

flush logs;

--error 1

--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null

--exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null

--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null

--exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null



# End of 5.1 tests