Commit 783634d6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bar/mysql-5.0.merge 

into  mysql.com:/home/bar/mysql-5.1-rpl


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents db30ee26 4a83cd38

mysql-test/r/binlog_stm_ctype_ucs.result

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	102	User var	1	142	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	142	Query	1	231	use `test`; insert into t2 values (@v)

flush logs;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/;

use test/*!*/;

SET TIMESTAMP=10000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t2 values (@v)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

drop table t2;

mysql-test/r/ctype_cp932_binlog.result

0 → 100644
+46 −0
Original line number Diff line number Diff line 
drop table if exists t1;

set names cp932;

set character_set_database = cp932;

RESET MASTER;

CREATE TABLE t1(f1 blob);

PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))|

CREATE 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|

CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|

SELECT HEX(s1),HEX(s2),d FROM t4|

HEX(s1)	HEX(s2)	d

466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 402|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))

master-bin.000001	568	Query	1	816	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	816	Query	1	1035	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1035	Query	1	1124	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1124	Query	1	1203	use `test`; DROP TABLE t4

mysql-test/r/ctype_cp932_notembedded.result

0 → 100644
+17 −0
Original line number Diff line number Diff line 
drop table if exists t1;

set names cp932;

set character_set_database = cp932;

RESET MASTER;

CREATE TABLE t1(f1 blob);

PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

mysql-test/r/mysqlbinlog.result

+57 −0
Original line number Diff line number Diff line
@@ -274,3 +274,60 @@ call p1(); 
1

drop procedure p1;

flush logs;

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

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=latin1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=latin1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r;

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

D0AA

C3BF

D0AA

drop table t1;

flush logs;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

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/*!*/;

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/*!*/;

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/*!*/;

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/*!*/;

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/*!*/;

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/*!*/;

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/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop table t1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

mysql-test/r/rpl_loaddata2.result

+30 −146
Original line number Diff line number Diff line
@@ -4,150 +4,34 @@ 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

create table t1 (a varchar(10) character set utf8);

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=DEFAULT;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=DEFAULT;

load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r;

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

C3BF

D0AA

D0AA

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

C3BF

D0AA

D0AA

drop table t1;