Commit d5e983aa authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 3a520a78 a2b4f529

mysql-test/r/ctype_cp932.result

+12 −0
Original line number Diff line number Diff line
@@ -11353,3 +11353,15 @@ a 
a

a

drop table t1;

set names utf8;

create table t1 (a text) default character set cp932;

insert into t1 values (_utf8 0xE38182);

show warnings;

Level	Code	Message

select * from t1;

a

あ

select hex(a) from t1;

hex(a)

82A0

drop table t1;

mysql-test/r/ctype_cp932_binlog.result

+9 −9
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 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	185	use `test`; CREATE TABLE t1(f1 blob)

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

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

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
@@ -30,17 +30,17 @@ HEX(s1) HEX(s2) d 
466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 393|

SHOW BINLOG EVENTS FROM 402|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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	556	Query	1	801	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

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	801	Query	1	1017	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1017	Query	1	1103	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1103	Query	1	1179	use `test`; DROP TABLE t4
 
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

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 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	185	use `test`; CREATE TABLE t1(f1 blob)

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

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

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

mysql-test/r/innodb-replace.result

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ drop table if exists t1; 
create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;

select * from t1;

c1	c2	stamp

replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");

replace delayed into t1 (c1, c2)  values ( "text1","11");

ERROR HY000: Table storage engine for 't1' doesn't have this option

select * from t1;

c1	c2	stamp

replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );

replace delayed into t1 (c1, c2)  values ( "text1","12");

ERROR HY000: Table storage engine for 't1' doesn't have this option

select * from t1;

c1	c2	stamp

mysql-test/r/mysqlbinlog.result

+58 −0
Original line number Diff line number Diff line
@@ -272,3 +272,61 @@ call p1(); 
1

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