Commit a9a675a8 authored by unknown's avatar unknown
Browse files

Post merge changes. 


mysql-test/r/mysqldump.result:
  post-merge fix.
mysql-test/t/mysqldump.test:
  post-merge fix.
parent 80bb699f

mysql-test/r/mysqldump.result

+5 −5
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ USE `mysqldump_test_db`; 


drop database mysqldump_test_db;

CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');

INSERT INTO t1  VALUES (_latin1 '');



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

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -479,7 +479,7 @@ CREATE TABLE `t1` ( 


LOCK TABLES `t1` WRITE;

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

INSERT INTO `t1` VALUES ('Ž™šá');

INSERT INTO `t1` VALUES ('');

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -502,7 +502,7 @@ CREATE TABLE `t1` ( 


LOCK TABLES `t1` WRITE;

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

INSERT INTO `t1` VALUES ('Ž™šá');

INSERT INTO `t1` VALUES ('');

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -1676,11 +1676,11 @@ create table t1 (a text character set utf8, b text character set latin1); 
insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);

select * from t1;

a	b

Osnabrück	Köln

Osnabrck	Kln

test.t1: Records: 1  Deleted: 0  Skipped: 0  Warnings: 0

select * from t1;

a	b

Osnabrück	Köln

Osnabrck	Kln

drop table t1;

create table `t1` (

t1_name varchar(255) default null,

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ drop database mysqldump_test_db; 
# if it is explicitely set.



CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');

INSERT INTO t1  VALUES (_latin1 '');

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1

#

# Bug#8063: make test mysqldump [ fail ]