Commit 7de5f0bd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


sql/log_event.cc:
  Auto merged
parents 5cffd57e f860b754

mysql-test/r/ctype_cp932_binlog_stm.result

+3 −3
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ IN ind DECIMAL(10,2)) 
BEGIN

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

END

master-bin.000001	805	Query	1	1010	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1'Foo\'s a Bar'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1010	Query	1	1096	use `test`; DROP PROCEDURE bug18293

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

mysql-test/r/ctype_utf8.result

+23 −1
Original line number Diff line number Diff line
@@ -124,12 +124,34 @@ create table t1 select date_format("2004-01-19 10:10:10", "%Y-%m-%d"); 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varbinary(10) DEFAULT NULL

  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8 DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t1;

date_format("2004-01-19 10:10:10", "%Y-%m-%d")

2004-01-19

drop table t1;

set names utf8;

set LC_TIME_NAMES='fr_FR';

create table t1 (s1 char(20) character set latin1);

insert into t1 values (date_format('2004-02-02','%M'));

select hex(s1) from t1;

hex(s1)

66E97672696572

drop table t1;

create table t1 (s1 char(20) character set koi8r);

set LC_TIME_NAMES='ru_RU';

insert into t1 values (date_format('2004-02-02','%M'));

insert into t1 values (date_format('2004-02-02','%b'));

insert into t1 values (date_format('2004-02-02','%W'));

insert into t1 values (date_format('2004-02-02','%a'));

select hex(s1), s1 from t1;

hex(s1)	s1

E6C5D7D2C1CCD1	Февраля

E6C5D7	Фев

F0CFCEC5C4C5CCD8CEC9CB	Понедельник

F0CEC4	Пнд

drop table t1;

set LC_TIME_NAMES='en_US';

set names koi8r;

create table t1 (s1 char(1) character set utf8);

insert into t1 values (_koi8r'');

mysql-test/r/mysqldump.result

+72 −72
Original line number Diff line number Diff line
@@ -1787,6 +1787,78 @@ CREATE TABLE `t1` ( 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop table t1;

#

# BUG#13926: --order-by-primary fails if PKEY contains quote character

#

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

`a b` INT,

`c"d` INT,

`e``f` INT,

PRIMARY KEY (`a b`, `c"d`, `e``f`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

insert into t1 values (0815, 4711, 2006);

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS "t1";

CREATE TABLE "t1" (

  "a b" int(11) NOT NULL DEFAULT '0',

  "c""d" int(11) NOT NULL DEFAULT '0',

  "e`f" int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY ("a b","c""d","e`f")

);



LOCK TABLES "t1" WRITE;

/*!40000 ALTER TABLE "t1" DISABLE KEYS */;

INSERT INTO "t1" VALUES (815,4711,2006);

/*!40000 ALTER TABLE "t1" ENABLE KEYS */;

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;





/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a b` int(11) NOT NULL DEFAULT '0',

  `c"d` int(11) NOT NULL DEFAULT '0',

  `e``f` int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY (`a b`,`c"d`,`e``f`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

INSERT INTO `t1` VALUES (815,4711,2006);

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE `t1`;

End of 4.1 tests

#

# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)
@@ -3123,78 +3195,6 @@ drop user myDB_User; 
drop database mysqldump_myDB;

use test;

#

# BUG#13926: --order-by-primary fails if PKEY contains quote character

#

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

`a b` INT,

`c"d` INT,

`e``f` INT,

PRIMARY KEY (`a b`, `c"d`, `e``f`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

insert into t1 values (0815, 4711, 2006);

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS "t1";

CREATE TABLE "t1" (

  "a b" int(11) NOT NULL DEFAULT '0',

  "c""d" int(11) NOT NULL DEFAULT '0',

  "e`f" int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY ("a b","c""d","e`f")

);



LOCK TABLES "t1" WRITE;

/*!40000 ALTER TABLE "t1" DISABLE KEYS */;

INSERT INTO "t1" VALUES (815,4711,2006);

/*!40000 ALTER TABLE "t1" ENABLE KEYS */;

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;





/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a b` int(11) NOT NULL DEFAULT '0',

  `c"d` int(11) NOT NULL DEFAULT '0',

  `e``f` int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY (`a b`,`c"d`,`e``f`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

INSERT INTO `t1` VALUES (815,4711,2006);

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE `t1`;

#

# Bug #19745: mysqldump --xml produces invalid xml

#

DROP TABLE IF EXISTS t1;

mysql-test/r/rpl_charset_sjis.result

0 → 100644
+26 −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 table if exists t1;

drop procedure if exists p1;

create table t1 (a varchar(255) character set sjis);

create procedure p1 (in a varchar(255) character set sjis) insert into t1 values (a);

SET NAMES binary;

CALL p1 ('–\\');

select "--- on master ---";

--- on master ---

--- on master ---

select hex(a) from t1 ;

hex(a)

965C

select "--- on slave ---";

--- on slave ---

--- on slave ---

select hex(a) from t1;

hex(a)

965C

drop table t1;

drop procedure p1;

mysql-test/t/ctype_utf8.test

+20 −0
Original line number Diff line number Diff line
@@ -93,6 +93,26 @@ show create table t1; 
select * from t1;

drop table t1;



#

# Bug#22646 LC_TIME_NAMES: Assignment to non-UTF8 target fails

#

set names utf8;

set LC_TIME_NAMES='fr_FR';

create table t1 (s1 char(20) character set latin1);

insert into t1 values (date_format('2004-02-02','%M'));

select hex(s1) from t1;

drop table t1;

create table t1 (s1 char(20) character set koi8r);

set LC_TIME_NAMES='ru_RU';

insert into t1 values (date_format('2004-02-02','%M'));

insert into t1 values (date_format('2004-02-02','%b'));

insert into t1 values (date_format('2004-02-02','%W'));

insert into t1 values (date_format('2004-02-02','%a'));

select hex(s1), s1 from t1;

drop table t1;

set LC_TIME_NAMES='en_US';





#

# Bug #2366  	Wrong utf8 behaviour when data is truncated

#